4 files changed, 4 insertions, 7 deletions

diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index 54b3d1ec64..610c3021bf 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -172,8 +172,7 @@
 #define WPS_KEYLOCK    (BUTTON_MENU | BUTTON_DOWN)
 #define WPS_ID3        (BUTTON_MENU | BUTTON_ON)
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-(CONFIG_KEYPAD == IPOD_NANO_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
 
 /* TODO: Check WPS button assignments */
 
diff --git a/apps/gui/list.h b/apps/gui/list.h
index 5ba7983e0d..3ae1b80dc2 100644
--- a/apps/gui/list.h
+++ b/apps/gui/list.h
@@ -65,8 +65,7 @@
 #define LIST_NEXT      BUTTON_DOWN
 #define LIST_PREV      BUTTON_UP
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-       (CONFIG_KEYPAD == IPOD_NANO_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define LIST_NEXT      BUTTON_SCROLL_FWD
 #define LIST_PREV      BUTTON_SCROLL_BACK
 
diff --git a/apps/gui/select.h b/apps/gui/select.h
index 9bbfddf221..b6a9afd55c 100644
--- a/apps/gui/select.h
+++ b/apps/gui/select.h
@@ -54,8 +54,7 @@
 #define SELECT_CANCEL  BUTTON_STOP
 #define SELECT_CANCEL2 BUTTON_MENU
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || \
-      (CONFIG_KEYPAD == IPOD_NANO_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define SELECT_INC     BUTTON_SCROLL_FWD
 #define SELECT_DEC     BUTTON_SCROLL_BACK
 #define SELECT_OK      BUTTON_SELECT
diff --git a/apps/gui/yesno.h b/apps/gui/yesno.h
index ac6500daf8..5399c88391 100644
--- a/apps/gui/yesno.h
+++ b/apps/gui/yesno.h
@@ -23,7 +23,7 @@
 #elif CONFIG_KEYPAD == GMINI100_PAD
 #define YESNO_OK       BUTTON_PLAY
 
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_NANO_PAD)
+#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
 #define YESNO_OK       BUTTON_RIGHT
 #endif
 enum yesno_res