diff options
| author | Jonas Aaberg <jonas.aberg@stericsson.com> | 2012-02-29 14:28:42 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:03:40 +0200 |
| commit | be170847f6a78a1753831cf36b95d94417eb4eb3 (patch) | |
| tree | a02bd6ffd8790185e0bf6698a7e4b372881a3983 | |
| parent | 1127d5036421b97ceb2a396978863f2fbb8ac7b8 (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-- | drivers/input/misc/ab5500-accdet.c | 2 | ||||
| -rw-r--r-- | drivers/input/misc/ab8500-accdet.c | 2 | ||||
| -rw-r--r-- | drivers/input/misc/abx500-accdet.c | 10 | ||||
| -rw-r--r-- | include/linux/input/abx500-accdet.h (renamed from arch/arm/mach-ux500/include/mach/abx500-accdet.h) | 0 |
4 files changed, 8 insertions, 6 deletions
diff --git a/drivers/input/misc/ab5500-accdet.c b/drivers/input/misc/ab5500-accdet.c index 7622f3b45e9..fa8e2523126 100644 --- a/drivers/input/misc/ab5500-accdet.c +++ b/drivers/input/misc/ab5500-accdet.c @@ -18,7 +18,7 @@ #include <linux/mfd/abx500.h> #include <linux/interrupt.h> #include <linux/platform_device.h> -#include <mach/abx500-accdet.h> +#include <linux/input/abx500-accdet.h> /* * Register definition for accessory detection. diff --git a/drivers/input/misc/ab8500-accdet.c b/drivers/input/misc/ab8500-accdet.c index 59ad959e909..5786558bec3 100644 --- a/drivers/input/misc/ab8500-accdet.c +++ b/drivers/input/misc/ab8500-accdet.c @@ -20,7 +20,7 @@ #include <linux/mfd/abx500/ab8500-gpio.h> #include <linux/gpio.h> #include <linux/err.h> -#include <mach/abx500-accdet.h> +#include <linux/input/abx500-accdet.h> #ifdef CONFIG_SND_SOC_UX500_AB8500 #include <sound/ux500_ab8500_ext.h> #endif diff --git a/drivers/input/misc/abx500-accdet.c b/drivers/input/misc/abx500-accdet.c index 5c4e96c73d6..4b5017a6e60 100644 --- a/drivers/input/misc/abx500-accdet.c +++ b/drivers/input/misc/abx500-accdet.c @@ -19,15 +19,17 @@ #include <linux/jiffies.h> #include <linux/slab.h> #include <linux/input.h> -#include <sound/soc.h> -#include <sound/jack.h> +#include <linux/interrupt.h> +#include <linux/input/abx500-accdet.h> #include <linux/platform_device.h> #include <linux/regulator/consumer.h> #include <linux/gpio.h> #include <linux/mfd/abx500.h> -#include <linux/interrupt.h> + +#include <sound/jack.h> +#include <sound/soc.h> #include <sound/jack.h> -#include <mach/abx500-accdet.h> + #ifdef CONFIG_SND_SOC_UX500_AB8500 #include <sound/ux500_ab8500.h> #else diff --git a/arch/arm/mach-ux500/include/mach/abx500-accdet.h b/include/linux/input/abx500-accdet.h index 9871ae11530..9871ae11530 100644 --- a/arch/arm/mach-ux500/include/mach/abx500-accdet.h +++ b/include/linux/input/abx500-accdet.h |