summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--firmware/target/arm/as3525/kernel-as3525.c2
-rw-r--r--firmware/target/arm/imx233/system-imx233.c2
-rw-r--r--firmware/target/sh/archos/ondio/button-ondio.c4
-rw-r--r--firmware/target/sh/archos/ondio/button-target.h2
4 files changed, 6 insertions, 4 deletions
diff --git a/firmware/target/arm/as3525/kernel-as3525.c b/firmware/target/arm/as3525/kernel-as3525.c
index d44b120387..527ae70bb2 100644
--- a/firmware/target/arm/as3525/kernel-as3525.c
+++ b/firmware/target/arm/as3525/kernel-as3525.c
@@ -25,7 +25,7 @@
#include "timer.h"
#if INCREASED_SCROLLWHEEL_POLLING
-#include "button-target.h"
+#include "button.h"
/* The scrollwheel is polled every 5 ms (the tick tasks only every 10) */
static int poll_scrollwheel = 0;
diff --git a/firmware/target/arm/imx233/system-imx233.c b/firmware/target/arm/imx233/system-imx233.c
index a97cf198c8..19d0a7fac9 100644
--- a/firmware/target/arm/imx233/system-imx233.c
+++ b/firmware/target/arm/imx233/system-imx233.c
@@ -32,7 +32,7 @@
#include "i2c-imx233.h"
#include "lcd.h"
#include "backlight-target.h"
-#include "button-target.h"
+#include "button.h"
#define default_interrupt(name) \
extern __attribute__((weak, alias("UIRQ"))) void name(void)
diff --git a/firmware/target/sh/archos/ondio/button-ondio.c b/firmware/target/sh/archos/ondio/button-ondio.c
index 91e43fc41a..e3b370bc1f 100644
--- a/firmware/target/sh/archos/ondio/button-ondio.c
+++ b/firmware/target/sh/archos/ondio/button-ondio.c
@@ -37,6 +37,10 @@
ON/OFF: AN3, low active (assigned as OFF)
*/
+void button_init_device(void)
+{
+}
+
int button_read_device(void)
{
int btn = BUTTON_NONE;
diff --git a/firmware/target/sh/archos/ondio/button-target.h b/firmware/target/sh/archos/ondio/button-target.h
index b23d157b6d..a84be2851a 100644
--- a/firmware/target/sh/archos/ondio/button-target.h
+++ b/firmware/target/sh/archos/ondio/button-target.h
@@ -22,8 +22,6 @@
#ifndef _BUTTON_TARGET_H_
#define _BUTTON_TARGET_H_
-#define button_init_device()
-
#define BUTTON_OFF 0x00000001
#define BUTTON_MENU 0x00000002