2 files changed, 3 insertions, 6 deletions

diff --git a/apps/gui/list.c b/apps/gui/list.c
index 2923ec33c4..8df0a29d52 100644
--- a/apps/gui/list.c
+++ b/apps/gui/list.c
@@ -588,7 +588,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
     static bool scrolling_left = false;
 #endif
 
-#ifdef HAVE_SCROLLWHEEL
+#ifdef HAVE_WHEEL_ACCELERATION
     int next_item_modifier = button_apply_acceleration(get_action_data());
 #else
     static int next_item_modifier = 1;
@@ -659,7 +659,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
         case ACTION_STD_PREV:
         case ACTION_STD_PREVREPEAT:
                 gui_list_select_at_offset(lists, -next_item_modifier);
-#ifndef HAVE_SCROLLWHEEL
+#ifndef HAVE_WHEEL_ACCELERATION
             if (button_queue_count() < FRAMEDROP_TRIGGER)
 #endif
                 gui_synclist_draw(lists);
@@ -673,7 +673,7 @@ bool gui_synclist_do_button(struct gui_synclist * lists,
         case ACTION_STD_NEXT:
         case ACTION_STD_NEXTREPEAT:
                 gui_list_select_at_offset(lists, next_item_modifier);
-#ifndef HAVE_SCROLLWHEEL
+#ifndef HAVE_WHEEL_ACCELERATION
             if (button_queue_count() < FRAMEDROP_TRIGGER)
 #endif
                 gui_synclist_draw(lists);
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c
index 30df8ea6ec..7223197fcc 100644
--- a/apps/gui/option_select.c
+++ b/apps/gui/option_select.c
@@ -38,9 +38,6 @@
 #include "quickscreen.h"
 
 #if defined (HAVE_SCROLLWHEEL)      || \
-    (CONFIG_KEYPAD == IPOD_3G_PAD)  || \
-    (CONFIG_KEYPAD == IPOD_4G_PAD)  || \
-    (CONFIG_KEYPAD == IPOD_1G2G_PAD) || \
     (CONFIG_KEYPAD == PLAYER_PAD)
 /* Define this if your target makes sense to have 
    smaller values at the top of the list increasing down the list */