Index: apps/gui/list.h
===================================================================
RCS file: /cvsroot/rockbox/apps/gui/list.h,v
retrieving revision 1.7
diff -u -r1.7 list.h
--- apps/gui/list.h	12 Nov 2005 16:07:17 -0000	1.7
+++ apps/gui/list.h	15 Nov 2005 12:58:57 -0000
@@ -33,24 +33,31 @@
 #define LIST_PREV      BUTTON_UP
 #define LIST_PGUP      (BUTTON_ON | BUTTON_UP)
 #define LIST_PGDN      (BUTTON_ON | BUTTON_DOWN)
+#ifdef HAVE_REMOTE_LCD
 #define LIST_RC_NEXT   BUTTON_RC_FF
 #define LIST_RC_PREV   BUTTON_RC_REW
 #define LIST_RC_PGUP   BUTTON_RC_SOURCE
 #define LIST_RC_PGDN   BUTTON_RC_BITRATE
+#endif
 
 #elif CONFIG_KEYPAD == RECORDER_PAD
 #define LIST_NEXT      BUTTON_DOWN
 #define LIST_PREV      BUTTON_UP
 #define LIST_PGUP      (BUTTON_ON | BUTTON_UP)
 #define LIST_PGDN      (BUTTON_ON | BUTTON_DOWN)
+#ifdef HAVE_REMOTE_LCD
 #define LIST_RC_NEXT   BUTTON_RC_RIGHT
 #define LIST_RC_PREV   BUTTON_RC_LEFT
+#endif
 
 #elif CONFIG_KEYPAD == PLAYER_PAD
 #define LIST_NEXT      BUTTON_RIGHT
 #define LIST_PREV      BUTTON_LEFT
+#ifdef HAVE_REMOTE_LCD
 #define LIST_RC_NEXT   BUTTON_RC_RIGHT
 #define LIST_RC_PREV   BUTTON_RC_LEFT
+#endif
+
 
 #elif CONFIG_KEYPAD == ONDIO_PAD
 #define LIST_NEXT      BUTTON_DOWN
Index: firmware/drivers/button.c
===================================================================
RCS file: /cvsroot/rockbox/firmware/drivers/button.c,v
retrieving revision 1.93
diff -u -r1.93 button.c
--- firmware/drivers/button.c	11 Nov 2005 17:51:35 -0000	1.93
+++ firmware/drivers/button.c	15 Nov 2005 12:58:59 -0000
@@ -370,19 +370,26 @@
 #if (CONFIG_KEYPAD == IRIVER_H100_PAD) || (CONFIG_KEYPAD == IRIVER_H300_PAD)
 
     static bool hold_button = false;
+#ifdef CONFIG_REMOTE_KEYPAD
     static bool remote_hold_button = false;
+#endif
 
     /* light handling */
     if (hold_button && !button_hold())
     {
         backlight_on();
     }
+    hold_button = button_hold();
+    
+#ifdef CONFIG_REMOTE_KEYPAD
     if (remote_hold_button && !remote_button_hold())
     {
         remote_backlight_on();
     }
-    hold_button = button_hold();
     remote_hold_button = remote_button_hold();
+#endif
+    
+    
 
     /* normal buttons */
     if (!button_hold())
@@ -413,7 +420,8 @@
                     if (data < 0xf0)
                         btn = BUTTON_REC;
     }
-    
+
+#ifdef CONFIG_REMOTE_KEYPAD
     /* remote buttons */
     if (!remote_button_hold())
     {
@@ -449,7 +457,8 @@
                     if (data < 0xf0)
                         btn = BUTTON_RC_REW;
     }
-                    
+#endif
+           
     /* special buttons */
     data = GPIO1_READ;
     if (!button_hold() && ((data & 0x20) == 0))