From 6c545419ba0188fab4074c79f7a0536f5b7312b9 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Aguiar Date: Tue, 29 Jul 2008 12:44:27 -0400 Subject: [PATCH] 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 Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/board-h4-mmc.c | 2 +- arch/arm/mach-omap2/board-h4.c | 2 +- arch/arm/mach-omap2/board-n800-camera.c | 2 +- arch/arm/mach-omap2/board-n800-mmc.c | 2 +- arch/arm/mach-omap2/board-n800.c | 2 +- arch/arm/plat-omap/devices.c | 2 +- drivers/i2c/chips/menelaus.c | 2 +- drivers/input/keyboard/omap-keypad.c | 2 +- include/{asm-arm/arch-omap => linux/i2c}/menelaus.h | 0 9 files changed, 8 insertions(+), 8 deletions(-) rename include/{asm-arm/arch-omap => linux/i2c}/menelaus.h (100%) diff --git a/arch/arm/mach-omap2/board-h4-mmc.c b/arch/arm/mach-omap2/board-h4-mmc.c index 9cdb00fbd47..84b3f4e9e7f 100644 --- a/arch/arm/mach-omap2/board-h4-mmc.c +++ b/arch/arm/mach-omap2/board-h4-mmc.c @@ -15,10 +15,10 @@ */ #include -#include #include #include +#include #ifdef CONFIG_MMC_OMAP diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c index 101b455f3f0..c17446795ba 100644 --- a/arch/arm/mach-omap2/board-h4.c +++ b/arch/arm/mach-omap2/board-h4.c @@ -22,6 +22,7 @@ #include #include #include +#include #include #include @@ -42,7 +43,6 @@ #include #include #include -#include #include #include diff --git a/arch/arm/mach-omap2/board-n800-camera.c b/arch/arm/mach-omap2/board-n800-camera.c index aafa5471d4d..94148822f56 100644 --- a/arch/arm/mach-omap2/board-n800-camera.c +++ b/arch/arm/mach-omap2/board-n800-camera.c @@ -25,12 +25,12 @@ #include #include #include +#include #include #include -#include #include #include diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c index 26f3709a16f..2028710c8fe 100644 --- a/arch/arm/mach-omap2/board-n800-mmc.c +++ b/arch/arm/mach-omap2/board-n800-mmc.c @@ -10,11 +10,11 @@ */ #include -#include #include #include #include +#include #ifdef CONFIG_MMC_OMAP diff --git a/arch/arm/mach-omap2/board-n800.c b/arch/arm/mach-omap2/board-n800.c index 868e13970b9..2baaf048196 100644 --- a/arch/arm/mach-omap2/board-n800.c +++ b/arch/arm/mach-omap2/board-n800.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -34,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index b83f9a62a90..57df7241855 100644 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -13,6 +13,7 @@ #include #include #include +#include #include #include @@ -25,7 +26,6 @@ #include #include #include -#include #include #include diff --git a/drivers/i2c/chips/menelaus.c b/drivers/i2c/chips/menelaus.c index b7a7f016d0e..e65245e2238 100644 --- a/drivers/i2c/chips/menelaus.c +++ b/drivers/i2c/chips/menelaus.c @@ -41,12 +41,12 @@ #include #include #include +#include #include #include #include -#include #define DRIVER_NAME "menelaus" diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index 0eba78e5fd5..90c092f2030 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c @@ -35,9 +35,9 @@ #include #include #include +#include #include #include -#include #include #include #include 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 -- 2.41.3