summaryrefslogtreecommitdiff
path: root/firmware/drivers/button.c
diff options
context:
space:
mode:
authorSebastian Leonhardt <sebastian.leonhardt@web.de>2014-03-14 16:21:34 +0100
committerThomas Martitz <kugel@rockbox.org>2014-03-18 10:56:19 +0100
commit1cf17436b77659aa59e205c1dcf62b4fe485e95e (patch)
treeaa2428a0036ee4e3403eae617e40ec333a7158f9 /firmware/drivers/button.c
parent915bc0999676b1d42f8c9dd57e5911931cd34fcd (diff)
downloadrockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.tar.gz
rockbox-1cf17436b77659aa59e205c1dcf62b4fe485e95e.zip
Fix (unintentional) linkage of HAVE_BUTTON_DATA with HAVE_TOUCHSCREEN
Defining HAVE_BUTTON_DATA without simultaneously defining HAVE_TOUCHSCREEN caused compile errors. (I need them separated for a scrollstrip driver.) Change-Id: I945d3437d840035ccc0c147f8155029b403c6ec2 Reviewed-on: http://gerrit.rockbox.org/771 Reviewed-by: Amaury Pouly <amaury.pouly@gmail.com> Reviewed-by: Thomas Martitz <kugel@rockbox.org>
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r--firmware/drivers/button.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index 1cc95428ab..718fb6a6da 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -87,13 +87,13 @@ static bool phones_present = false;
87 87
88#ifdef HAVE_BUTTON_DATA 88#ifdef HAVE_BUTTON_DATA
89static int button_read(int *data); 89static int button_read(int *data);
90static int lastdata = 0;
90#else 91#else
91static int button_read(void); 92static int button_read(void);
92#endif 93#endif
93 94
94#ifdef HAVE_TOUCHSCREEN 95#ifdef HAVE_TOUCHSCREEN
95static int last_touchscreen_touch; 96static int last_touchscreen_touch;
96static int lastdata = 0;
97#endif 97#endif
98#if defined(HAVE_HEADPHONE_DETECTION) 98#if defined(HAVE_HEADPHONE_DETECTION)
99static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */ 99static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */