diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-17 20:15:15 -0500 |
| commit | e2ab2e50a0723b11802e33074e0dd5d9f7d81496 (patch) | |
| tree | 843680a4e5f4e7de6d90f7e7a1e493508f9c1a36 /src/agb_flash_mx.c | |
| parent | d4bd4c393e59bb66a8d4f69f23dce694982723e1 (diff) | |
| parent | 67ced1d77ec0d36cc2b6ebcbfc58ba28b357ddbb (diff) | |
fix merge conflicts
Diffstat (limited to 'src/agb_flash_mx.c')
| -rw-r--r-- | src/agb_flash_mx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/agb_flash_mx.c b/src/agb_flash_mx.c index 01f848901..67348901f 100644 --- a/src/agb_flash_mx.c +++ b/src/agb_flash_mx.c @@ -26,7 +26,11 @@ const struct FlashSetupInfo MX29L010 = 0 // appears to be unused }, { 3, 1 }, // wait state setup data +#if defined(GERMAN) && defined(SAPPHIRE) + { { 0xBF, 0xD4 } } // ID +#else { { 0xC2, 0x09 } } // ID +#endif } }; |