OMAP: MENELAUS: Move menelaus header to include/linux/i2c

This patch moves menelaus header from include/asm-arm/arch-omap/
to include/linux/i2c/

It also includes menelaus' headers to include/linux/i2c

Signed-off-by: Carlos Eduardo Aguiar <carlos.aguiar@indt.org.br>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-h4-mmc.c b/arch/arm/mach-omap2/board-h4-mmc.c
index 9cdb00fbd475ca69458553df3506938ec8289554..84b3f4e9e7f601c8ea9550414216e2679fd92afa 100644 (file)
--- a/arch/arm/mach-omap2/board-h4-mmc.c
+++ b/arch/arm/mach-omap2/board-h4-mmc.c
@@ -15,10 +15,10 @@
  */
 
 #include <asm/arch/mmc.h>
-#include <asm/arch/menelaus.h>
 
 #include <asm/mach-types.h>
 #include <linux/delay.h>
+#include <linux/i2c/menelaus.h>
 
 #ifdef CONFIG_MMC_OMAP
 

diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 101b455f3f0773b2367573f3d4784fed7ce248df..c17446795baea7bf6694a40389663bc99f28d5d2 100644 (file)
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -22,6 +22,7 @@
 #include <linux/err.h>
 #include <linux/clk.h>
 #include <linux/i2c.h>
+#include <linux/i2c/menelaus.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/tsc210x.h>
 
@@ -42,7 +43,6 @@
 #include <asm/arch/board.h>
 #include <asm/arch/common.h>
 #include <asm/arch/keypad.h>
-#include <asm/arch/menelaus.h>
 #include <asm/arch/dma.h>
 #include <asm/arch/gpmc.h>
 

diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c
index aafa5471d4d0601f8b6c2e64afb75a00ca03da46..94148822f567c557db8358c1f7d0e5bbcf5f2f61 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-camera.c
+++ b/arch/arm/mach-omap2/board-n800-camera.c
@@ -25,12 +25,12 @@
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/videodev2.h>
+#include <linux/i2c/menelaus.h>
 
 #include <media/v4l2-int-device.h>
 
 #include <asm/mach-types.h>
 
-#include <asm/arch/menelaus.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/board.h>
 

diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c
index 26f3709a16fa81a90301e166ce716247d09f5af0..2028710c8fed8dde3c1bbcd429b2a51ce3c56be7 100644 (file)
--- a/arch/arm/mach-omap2/board-n800-mmc.c
+++ b/arch/arm/mach-omap2/board-n800-mmc.c
@@ -10,11 +10,11 @@
  */
 
 #include <asm/arch/mmc.h>
-#include <asm/arch/menelaus.h>
 #include <asm/arch/gpio.h>
 
 #include <asm/mach-types.h>
 #include <linux/delay.h>
+#include <linux/i2c/menelaus.h>
 
 #ifdef CONFIG_MMC_OMAP
 

diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c
index 868e13970b90f78347ff0abd3420b76cbc40b432..2baaf048196d3220cf5c58f7bb3cff91be3ce3ed 100644 (file)
--- a/arch/arm/mach-omap2/board-n800.c
+++ b/arch/arm/mach-omap2/board-n800.c
@@ -25,6 +25,7 @@
 #include <linux/irq.h>
 #include <linux/i2c.h>
 #include <linux/i2c/lm8323.h>
+#include <linux/i2c/menelaus.h>
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -34,7 +35,6 @@
 #include <asm/arch/board.h>
 #include <asm/arch/common.h>
 #include <asm/arch/mcspi.h>
-#include <asm/arch/menelaus.h>
 #include <asm/arch/lcd_mipid.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/gpio-switch.h>

diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index b83f9a62a90bd74ebbb5d08f454300d8f944d0c9..57df7241855ee2b5196157ae82a7a385c673c220 100644 (file)
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -13,6 +13,7 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/platform_device.h>
+#include <linux/i2c/menelaus.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>
@@ -25,7 +26,6 @@
 #include <asm/arch/mmc.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/menelaus.h>
 #include <asm/arch/dsp_common.h>
 #include <asm/arch/mcbsp.h>
 

diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c
index b7a7f016d0e9e614116285715131051bb36eb49d..e65245e2238357353c1df0def0074502490c5692 100644 (file)
--- a/drivers/i2c/chips/menelaus.c
+++ b/drivers/i2c/chips/menelaus.c
@@ -41,12 +41,12 @@
 #include <linux/delay.h>
 #include <linux/rtc.h>
 #include <linux/bcd.h>
+#include <linux/i2c/menelaus.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/irq.h>
 
 #include <asm/arch/gpio.h>
-#include <asm/arch/menelaus.h>
 
 #define DRIVER_NAME                    "menelaus"
 

diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c
index 0eba78e5fd502272ba6d6eff275cbd65064bcbbf..90c092f20302664d84a17111b20ad741657939a2 100644 (file)
--- a/drivers/input/keyboard/omap-keypad.c
+++ b/drivers/input/keyboard/omap-keypad.c
@@ -35,9 +35,9 @@
 #include <linux/mutex.h>
 #include <linux/spinlock.h>
 #include <linux/errno.h>
+#include <linux/i2c/menelaus.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/keypad.h>
-#include <asm/arch/menelaus.h>
 #include <asm/irq.h>
 #include <asm/hardware.h>
 #include <asm/io.h>

diff --git a/include/asm-arm/arch-omap/menelaus.h b/include/linux/i2c/menelaus.h
similarity index 100%
rename from include/asm-arm/arch-omap/menelaus.h
rename to include/linux/i2c/menelaus.h