Fix yellows and reds (one was a type, the other was rather incorrect before already)

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27021 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 8 insertions, 7 deletions

diff --git a/firmware/backlight.c b/firmware/backlight.c
index 6a5070df49..5406f1eeec 100644
--- a/firmware/backlight.c
+++ b/firmware/backlight.c
@@ -37,18 +37,20 @@
 #include "lcd.h"
 #include "screendump.h"
 
+#ifdef HAVE_BACKLIGHT
+
 #ifdef HAVE_REMOTE_LCD
 #include "lcd-remote.h"
 #endif
 
-#if defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT)
-
 #ifndef SIMULATOR
 #include "backlight-target.h"
 #else
 #include "backlight-sim.h"
 #endif
 
+#if defined(BACKLIGHT_FULL_INIT)
+
 #if (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_SETTING) \
     || (CONFIG_BACKLIGHT_FADING == BACKLIGHT_FADING_SW_HW_REG)
 #include "backlight-sw-fading.h"
@@ -960,16 +962,13 @@ void buttonlight_set_brightness(int val)
 }
 #endif /* HAVE_BUTTONLIGHT_BRIGHTNESS */
 
-#else /* !defined(HAVE_BACKLIGHT) || !defined(BACKLIGHT_FULL_INIT)
+#else /* !defined(BACKLIGHT_FULL_INIT)
     -- no backlight, empty dummy functions */
-
-#if defined(HAVE_BACKLIGHT) && !defined(BACKLIGHT_FULL_INIT)
 void backlight_init(void)
 {
     (void)_backlight_init();
     _backlight_on();
 }
-#endif
 
 void backlight_on(void) {}
 void backlight_off(void) {}
@@ -998,4 +997,6 @@ void backlight_set_brightness(int val) { (void)val; }
 #ifdef HAVE_BUTTONLIGHT_BRIGHTNESS
 void buttonlight_set_brightness(int val) { (void)val; }
 #endif
-#endif /* defined(HAVE_BACKLIGHT) && defined(BACKLIGHT_FULL_INIT) */
+#endif /* defined(BACKLIGHT_FULL_INIT) */
+
+#endif /* HAVE_BACKLIGHT */