summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Aaberg <jonas.aberg@stericsson.com>2012-02-29 14:28:42 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:02:45 +0200
commitc0dafe0857b2ab58268d05228eaee92506e21d89 (patch)
tree24bdab5260dc3b289451fd268f60326008ac769b
parent1828073b743cba36d2fa9951e5d0ec1fd9dea61f (diff)
ARM: ux500: input: abx500-accdet: Move header file
Move header file from include/mach to include/linux/input since it belongs to a driver not to a certain mach. ST-Ericsson ID: 370799 Signed-off-by: Jonas Aaberg <jonas.aberg@stericsson.com>
-rw-r--r--arch/arm/mach-ux500/board-mop500.c6
-rw-r--r--arch/arm/mach-ux500/board-u5500.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 11f5e9477ed..d3b016d92c6 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -46,6 +46,9 @@
#include <linux/leds.h>
#include <linux/mfd/abx500/ab8500-sysctrl.h>
+#ifdef CONFIG_INPUT_AB8500_ACCDET
+#include <linux/input/abx500-accdet.h>
+#endif
#include <asm/mach-types.h>
#include <asm/mach/arch.h>
@@ -58,9 +61,6 @@
#include <mach/hardware.h>
#include <mach/setup.h>
#include <mach/devices.h>
-#ifdef CONFIG_INPUT_AB8500_ACCDET
-#include <mach/abx500-accdet.h>
-#endif
#include <mach/irqs.h>
#include <mach/ste-dma40-db8500.h>
#ifdef CONFIG_U8500_SIM_DETECT
diff --git a/arch/arm/mach-ux500/board-u5500.c b/arch/arm/mach-ux500/board-u5500.c
index 3a874c10326..8429363531d 100644
--- a/arch/arm/mach-ux500/board-u5500.c
+++ b/arch/arm/mach-ux500/board-u5500.c
@@ -23,6 +23,7 @@
#ifdef CONFIG_TOUCHSCREEN_CYTTSP_SPI
#include <linux/cyttsp.h>
#endif
+#include <linux/input/abx500-accdet.h>
#ifdef CONFIG_AV8100
#include <video/av8100.h>
@@ -44,7 +45,6 @@
#include <mach/setup.h>
#include <mach/db5500-keypad.h>
#include <mach/crypto-ux500.h>
-#include <mach/abx500-accdet.h>
#include "pins-db5500.h"
#include "pins.h"