summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2010-08-01 10:07:05 +0000
committerBertrik Sikken <bertrik@sikken.nl>2010-08-01 10:07:05 +0000
commit3a8e7e644bd0e67193d8b1a8340e06a9383c3d15 (patch)
tree04acfb8d346f9597459af0208bda7d1608677b0e /firmware
parent9b6d895276230fe66721bf3622af0ff17aa7a1b2 (diff)
downloadrockbox-3a8e7e644bd0e67193d8b1a8340e06a9383c3d15.tar.gz
rockbox-3a8e7e644bd0e67193d8b1a8340e06a9383c3d15.tar.bz2
rockbox-3a8e7e644bd0e67193d8b1a8340e06a9383c3d15.zip
Various minor cleanups
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27647 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/backlight.c6
-rw-r--r--firmware/sdmmc.c5
2 files changed, 5 insertions, 6 deletions
diff --git a/firmware/backlight.c b/firmware/backlight.c
index f9575dfdb7..1d98a0cfa7 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -973,7 +973,6 @@ void backlight_init(void)
void backlight_on(void) {}
void backlight_off(void) {}
-void buttonlight_on(void) {}
void backlight_set_timeout(int value) {(void)value;}
bool is_backlight_on(bool ignore_always_off)
@@ -995,7 +994,12 @@ bool is_remote_backlight_on(bool ignore_always_off)
#ifdef HAVE_BACKLIGHT_BRIGHTNESS
void backlight_set_brightness(int val) { (void)val; }
#endif
+
+#ifdef HAVE_BUTTONLIGHT
+void buttonlight_on(void) {}
#ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
void buttonlight_set_brightness(int val) { (void)val; }
#endif
+#endif /* HAVE_BUTTONLIGHT */
+
#endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */
diff --git a/firmware/sdmmc.c b/firmware/sdmmc.c
index f499ffae08..bb3820f930 100644
--- a/firmware/sdmmc.c
+++ b/firmware/sdmmc.c
@@ -18,13 +18,8 @@
* KIND, either express or implied.
*
****************************************************************************/
-#include <stdbool.h>
#include "config.h"
-#if (CONFIG_STORAGE & STORAGE_MMC)
-#include "ata_mmc.h"
-#else
#include "sdmmc.h"
-#endif
/* helper function to extract n (<=32) bits from an arbitrary position.
counting from MSB to LSB */