diff options
| author | Thomas Martitz <kugel@rockbox.org> | 2014-02-23 23:03:18 +0100 |
|---|---|---|
| committer | Thomas Martitz <kugel@rockbox.org> | 2014-02-23 23:03:18 +0100 |
| commit | 3b7057fdae3cc47b61f0a3b14443a56cd52f4c2e (patch) | |
| tree | e10b0bb2a655aaaa1f9f3491592e9943fce35c21 /firmware | |
| parent | d7ba70de41902639a0b95bbdf0d7ec6452523db8 (diff) | |
| download | rockbox-3b7057fdae3cc47b61f0a3b14443a56cd52f4c2e.tar.gz rockbox-3b7057fdae3cc47b61f0a3b14443a56cd52f4c2e.zip | |
Second try at undefing STORAGE_GET_INFO, the previous one was too hasty, sorry.
Change-Id: If938c132d46efcb531227d9fde8cce91104566e0
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/export/config.h | 2 | ||||
| -rw-r--r-- | firmware/export/config/sim.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/firmware/export/config.h b/firmware/export/config.h index b3616ad3d3..1998720f87 100644 --- a/firmware/export/config.h +++ b/firmware/export/config.h | |||
| @@ -1109,9 +1109,11 @@ Lyre prototype 1 */ | |||
| 1109 | #define INCLUDE_TIMEOUT_API | 1109 | #define INCLUDE_TIMEOUT_API |
| 1110 | #endif /* HAVE_GUI_BOOST && HAVE_ADJUSTABLE_CPU_FREQ */ | 1110 | #endif /* HAVE_GUI_BOOST && HAVE_ADJUSTABLE_CPU_FREQ */ |
| 1111 | 1111 | ||
| 1112 | #ifndef SIMULATOR | ||
| 1112 | #if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND) | 1113 | #if defined(HAVE_USBSTACK) || (CONFIG_STORAGE & STORAGE_NAND) |
| 1113 | #define STORAGE_GET_INFO | 1114 | #define STORAGE_GET_INFO |
| 1114 | #endif | 1115 | #endif |
| 1116 | #endif | ||
| 1115 | 1117 | ||
| 1116 | #ifdef CPU_MIPS | 1118 | #ifdef CPU_MIPS |
| 1117 | #include <stdbool.h> /* MIPS GCC fix? */ | 1119 | #include <stdbool.h> /* MIPS GCC fix? */ |
diff --git a/firmware/export/config/sim.h b/firmware/export/config/sim.h index 0d075b0fcd..2f819b733e 100644 --- a/firmware/export/config/sim.h +++ b/firmware/export/config/sim.h | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | #undef HAVE_STORAGE_FLUSH | 33 | #undef HAVE_STORAGE_FLUSH |
| 34 | 34 | ||
| 35 | #undef CONFIG_NAND | 35 | #undef CONFIG_NAND |
| 36 | #undef HAVE_STORAGE_GET_INFO | ||
| 37 | 36 | ||
| 38 | #if defined(CONFIG_CHARGING) && CONFIG_CHARGING > CHARGING_MONITOR | 37 | #if defined(CONFIG_CHARGING) && CONFIG_CHARGING > CHARGING_MONITOR |
| 39 | #undef CONFIG_CHARGING | 38 | #undef CONFIG_CHARGING |