From 47bf6c5a5ad1fd9143ab87328793b285230f74a3 Mon Sep 17 00:00:00 2001
From: Jens Arnold <amiconn@rockbox.org>
Date: Thu, 12 Apr 2007 22:12:13 +0000
Subject: Moved archos backlight code to target tree. Changed old mutlivalue
 CONFIG_BACKLIGHT to a simple HAVE_BACKLIGHT.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13136 a1c6a512-1295-4272-9138-f99709370657
---
 apps/menus/display_menu.c   | 10 +++++-----
 apps/menus/recording_menu.c |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'apps/menus')

diff --git a/apps/menus/display_menu.c b/apps/menus/display_menu.c
index 0189749b18..660c68e996 100644
--- a/apps/menus/display_menu.c
+++ b/apps/menus/display_menu.c
@@ -38,7 +38,7 @@
 #include "lcd-remote.h"
 
 
-#if CONFIG_BACKLIGHT
+#ifdef HAVE_BACKLIGHT
 int filterfirstkeypress_callback(int action,const struct menu_item_ex *this_item)
 {
     (void)this_item;
@@ -77,7 +77,7 @@ int flipdisplay_callback(int action,const struct menu_item_ex *this_item)
 
 /***********************************/
 /*    LCD MENU                     */
-#if CONFIG_BACKLIGHT
+#ifdef HAVE_BACKLIGHT
 MENUITEM_SETTING(backlight_timeout, &global_settings.backlight_timeout, NULL);
 #if CONFIG_CHARGING
 MENUITEM_SETTING(backlight_timeout_plugged, 
@@ -102,7 +102,7 @@ MENUITEM_SETTING(lcd_sleep_after_backlight_off,
 #ifdef HAVE_BACKLIGHT_BRIGHTNESS
 MENUITEM_SETTING(brightness_item, &global_settings.brightness, NULL);
 #endif
-#endif /* CONFIG_BACKLIGHT */
+#endif /* HAVE_BACKLIGHT */
 #ifdef HAVE_LCD_CONTRAST
 MENUITEM_SETTING(contrast, &global_settings.contrast, NULL);
 #endif
@@ -173,7 +173,7 @@ MENUITEM_FUNCTION(reset_colors, 0, ID2P(LANG_RESET_COLORS),
 /* now the actual menu */
 MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
             NULL, Icon_Display_menu
-#if CONFIG_BACKLIGHT
+#ifdef HAVE_BACKLIGHT
             ,&backlight_timeout
 # if CONFIG_CHARGING
             ,&backlight_timeout_plugged
@@ -192,7 +192,7 @@ MAKE_MENU(lcd_settings,ID2P(LANG_LCD_MENU),
 # ifdef HAVE_BACKLIGHT_BRIGHTNESS
             ,&brightness_item
 # endif
-#endif /* CONFIG_BACKLIGHT */
+#endif /* HAVE_BACKLIGHT */
 #ifdef HAVE_LCD_CONTRAST
             ,&contrast
 #endif
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c
index 084ade0d33..1bc84e90d2 100644
--- a/apps/menus/recording_menu.c
+++ b/apps/menus/recording_menu.c
@@ -822,7 +822,7 @@ MAKE_MENU(recording_setting_menu, ID2P(LANG_RECORDING_SETTINGS), NULL, Icon_Reco
             &filesplitoptionsmenu,
             &rec_prerecord_time,
             &recdirectory,
-#if CONFIG_BACKLIGHT
+#ifdef HAVE_BACKLIGHT
             &cliplight,
 #endif
             &rectrigger_item,
-- 
cgit v1.2.3