From 1cf17436b77659aa59e205c1dcf62b4fe485e95e Mon Sep 17 00:00:00 2001 From: Sebastian Leonhardt Date: Fri, 14 Mar 2014 16:21:34 +0100 Subject: 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 Reviewed-by: Thomas Martitz --- firmware/drivers/button.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'firmware/drivers/button.c') 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; #ifdef HAVE_BUTTON_DATA static int button_read(int *data); +static int lastdata = 0; #else static int button_read(void); #endif #ifdef HAVE_TOUCHSCREEN static int last_touchscreen_touch; -static int lastdata = 0; #endif #if defined(HAVE_HEADPHONE_DETECTION) static struct timeout hp_detect_timeout; /* Debouncer for headphone plug/unplug */ -- cgit v1.2.3