summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2006-11-10 01:54:47 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2006-11-10 01:54:47 +0000
commit363d2ed77374cf5ba230a3a017e4c9c81f6efbd1 (patch)
tree1694d6982e50345cff1efc868a4662be84e9b26e
parent00ce880da779699d86159ab2eaea2474e9a2b151 (diff)
downloadrockbox-363d2ed77374cf5ba230a3a017e4c9c81f6efbd1.zip
rockbox-363d2ed77374cf5ba230a3a017e4c9c81f6efbd1.tar.gz
rockbox-363d2ed77374cf5ba230a3a017e4c9c81f6efbd1.tar.bz2
rockbox-363d2ed77374cf5ba230a3a017e4c9c81f6efbd1.tar.xz
clean up some artifacts left behind from the hxxx move to target tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11490 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/button.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 1cdd899..561dc6e 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -46,9 +46,6 @@
#ifdef TARGET_TREE
#include "button-target.h"
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \
- || (CONFIG_KEYPAD == IRIVER_H300_PAD)
-#include "button-target.h"
#endif
struct event_queue button_queue;
@@ -490,19 +487,11 @@ static int button_read(void)
int btn = BUTTON_NONE;
int retval;
#ifndef TARGET_TREE
-#if (CONFIG_KEYPAD != IRIVER_H100_PAD) \
- && (CONFIG_KEYPAD != IRIVER_H300_PAD)
int data;
#endif
-#endif
#ifdef TARGET_TREE
btn = button_read_device();
-
-#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) \
- || (CONFIG_KEYPAD == IRIVER_H300_PAD)
- btn = button_read_device(); /* temp untill TARGET_TREE is defined */
-
#elif CONFIG_KEYPAD == RECORDER_PAD
#ifndef HAVE_FMADC