Index: firmware/usb.c
===================================================================
--- firmware/usb.c	(revision 28636)
+++ firmware/usb.c	(working copy)
@@ -203,11 +203,7 @@
 #ifdef HAVE_USB_POWER
 static inline bool usb_power_button(void)
 {
-#if (defined(IRIVER_H10) || defined (IRIVER_H10_5GB)) && !defined(USE_ROCKBOX_USB)
-    return (button_status() & ~USBPOWER_BTN_IGNORE) != USBPOWER_BUTTON;
-#else
-    return (button_status() & ~USBPOWER_BTN_IGNORE) == USBPOWER_BUTTON;
-#endif
+    return (button_status());
 }
 
 #ifdef USB_FIREWIRE_HANDLING
Index: firmware/export/usb.h
===================================================================
--- firmware/export/usb.h	(revision 28636)
+++ firmware/export/usb.h	(working copy)
@@ -57,56 +57,6 @@
 #endif
 };
 
-#ifdef HAVE_USB_POWER
-#if CONFIG_KEYPAD == RECORDER_PAD
-#define USBPOWER_BUTTON BUTTON_F1
-#define USBPOWER_BTN_IGNORE BUTTON_ON
-#elif CONFIG_KEYPAD == ONDIO_PAD
-#define USBPOWER_BUTTON BUTTON_MENU
-#define USBPOWER_BTN_IGNORE BUTTON_OFF
-#elif (CONFIG_KEYPAD == IPOD_4G_PAD)
-#define USBPOWER_BUTTON BUTTON_MENU
-#define USBPOWER_BTN_IGNORE BUTTON_PLAY
-#elif CONFIG_KEYPAD == IRIVER_H300_PAD
-#define USBPOWER_BUTTON BUTTON_MODE
-#define USBPOWER_BTN_IGNORE BUTTON_ON
-#elif CONFIG_KEYPAD == GIGABEAT_PAD
-#define USBPOWER_BUTTON BUTTON_MENU
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#elif (CONFIG_KEYPAD == IRIVER_H10_PAD) || \
-      (CONFIG_KEYPAD == MROBE100_PAD)
-#define USBPOWER_BUTTON BUTTON_RIGHT
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#elif (CONFIG_KEYPAD == SANSA_E200_PAD) || \
-      (CONFIG_KEYPAD == SANSA_C200_PAD) || \
-      (CONFIG_KEYPAD == SANSA_CLIP_PAD) || \
-      (CONFIG_KEYPAD == SANSA_FUZE_PAD)
-#define USBPOWER_BUTTON BUTTON_SELECT
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#elif (CONFIG_KEYPAD == PHILIPS_SA9200_PAD)
-#define USBPOWER_BUTTON BUTTON_PLAY
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#elif CONFIG_KEYPAD == PHILIPS_HDD1630_PAD
-#define USBPOWER_BUTTON BUTTON_PLAYLIST
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#elif CONFIG_KEYPAD == PHILIPS_HDD6330_PAD
-#define USBPOWER_BUTTON BUTTON_LEFT
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#elif CONFIG_KEYPAD == SAMSUNG_YH_PAD
-#define USBPOWER_BUTTON BUTTON_RIGHT
-#define USBPOWER_BTN_IGNORE BUTTON_LEFT
-#elif CONFIG_KEYPAD == COWON_D2_PAD
-#define USBPOWER_BUTTON BUTTON_MENU
-#define USBPOWER_BTN_IGNORE BUTTON_MINUS
-#elif CONFIG_KEYPAD == ONDAVX747_PAD
-#define USBPOWER_BUTTON BUTTON_VOL_UP
-#define USBPOWER_BTN_IGNORE BUTTON_VOL_DOWN
-#elif CONFIG_KEYPAD == PBELL_VIBE500_PAD
-#define USBPOWER_BUTTON BUTTON_REC
-#define USBPOWER_BTN_IGNORE BUTTON_POWER
-#endif
-#endif /* HAVE_USB_POWER */
-
 #ifdef HAVE_USBSTACK
 /* USB class drivers */
 enum {