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