Re: [PATCH] ARM: OMAP: Clean up header file duplication

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



* Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx> [080915 06:02]:
> Signed-off-by: Hiroshi DOYU <Hiroshi.DOYU@xxxxxxxxx>
> ---
>  arch/arm/mach-omap1/board-h2-mmc.c     |    1 -
>  arch/arm/mach-omap1/board-h3-mmc.c     |    1 -
>  arch/arm/mach-omap1/board-h3.c         |    1 -
>  arch/arm/mach-omap2/board-h4.c         |    1 -
>  arch/arm/mach-omap2/board-n800-mmc.c   |    1 -
>  arch/arm/mach-omap2/board-omap3evm.c   |    2 --
>  drivers/input/keyboard/innovator_ps2.c |    1 -
>  drivers/mtd/nand/omap-hw.c             |    1 -
>  drivers/mtd/nand/omap-nand-flash.c     |    2 --
>  drivers/mtd/onenand/omap2.c            |    1 -
>  sound/oss/omap-audio-tsc2101.c         |    1 -
>  11 files changed, 0 insertions(+), 13 deletions(-)

Pushing this today, modified for board-omap3evm.c. Sorry it took so
long, it's been busy recently.

Tony


> 
> diff --git a/arch/arm/mach-omap1/board-h2-mmc.c b/arch/arm/mach-omap1/board-h2-mmc.c
> index 37031e0..d2cddf1 100644
> --- a/arch/arm/mach-omap1/board-h2-mmc.c
> +++ b/arch/arm/mach-omap1/board-h2-mmc.c
> @@ -14,7 +14,6 @@
>  
>  #include <mach/mmc.h>
>  #include <mach/gpio.h>
> -#include <mach/mmc.h>
>  
>  #ifdef CONFIG_MMC_OMAP
>  static int slot_cover_open;
> diff --git a/arch/arm/mach-omap1/board-h3-mmc.c b/arch/arm/mach-omap1/board-h3-mmc.c
> index 44e9d53..541fa6e 100644
> --- a/arch/arm/mach-omap1/board-h3-mmc.c
> +++ b/arch/arm/mach-omap1/board-h3-mmc.c
> @@ -14,7 +14,6 @@
>  
>  #include <mach/mmc.h>
>  #include <mach/gpio.h>
> -#include <mach/mmc.h>
>  
>  #ifdef CONFIG_MMC_OMAP
>  static int slot_cover_open;
> diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
> index 0c1b001..eaba9f3 100644
> --- a/arch/arm/mach-omap1/board-h3.c
> +++ b/arch/arm/mach-omap1/board-h3.c
> @@ -28,7 +28,6 @@
>  #include <linux/input.h>
>  #include <linux/i2c/tps65010.h>
>  #include <linux/clk.h>
> -#include <linux/i2c.h>
>  #include <linux/spi/spi.h>
>  #include <linux/spi/tsc210x.h>
>  
> diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
> index c65358b..733e134 100644
> --- a/arch/arm/mach-omap2/board-h4.c
> +++ b/arch/arm/mach-omap2/board-h4.c
> @@ -18,7 +18,6 @@
>  #include <linux/mtd/partitions.h>
>  #include <linux/delay.h>
>  #include <linux/workqueue.h>
> -#include <linux/i2c.h>
>  #include <linux/input.h>
>  #include <linux/err.h>
>  #include <linux/clk.h>
> diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c
> index bcbba94..b8aa7a3 100644
> --- a/arch/arm/mach-omap2/board-n800-mmc.c
> +++ b/arch/arm/mach-omap2/board-n800-mmc.c
> @@ -17,7 +17,6 @@
>  
>  #include <mach/mmc.h>
>  #include <mach/gpio.h>
> -#include <mach/mmc.h>
>  
>  #ifdef CONFIG_MMC_OMAP
>  
> diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
> index 92f70ce..dbbf1db 100644
> --- a/arch/arm/mach-omap2/board-omap3evm.c
> +++ b/arch/arm/mach-omap2/board-omap3evm.c
> @@ -27,8 +27,6 @@
>  #include <asm/mach-types.h>
>  #include <asm/mach/arch.h>
>  #include <asm/mach/map.h>
> -#include <linux/io.h>
> -#include <linux/delay.h>
>  
>  #include <mach/gpio.h>
>  #include <mach/keypad.h>
> diff --git a/drivers/input/keyboard/innovator_ps2.c b/drivers/input/keyboard/innovator_ps2.c
> index b3c4a06..5f88839 100644
> --- a/drivers/input/keyboard/innovator_ps2.c
> +++ b/drivers/input/keyboard/innovator_ps2.c
> @@ -82,7 +82,6 @@
>  #include <linux/kernel.h>
>  #include <linux/types.h>
>  #include <linux/delay.h>
> -#include <linux/types.h>
>  #include <linux/ptrace.h>
>  #include <linux/sched.h>
>  #include <linux/interrupt.h>
> diff --git a/drivers/mtd/nand/omap-hw.c b/drivers/mtd/nand/omap-hw.c
> index 1eb19ce..7eb9894 100644
> --- a/drivers/mtd/nand/omap-hw.c
> +++ b/drivers/mtd/nand/omap-hw.c
> @@ -27,7 +27,6 @@
>  #include <linux/init.h>
>  #include <linux/module.h>
>  #include <linux/delay.h>
> -#include <linux/delay.h>
>  #include <linux/errno.h>
>  #include <linux/sched.h>
>  #include <linux/types.h>
> diff --git a/drivers/mtd/nand/omap-nand-flash.c b/drivers/mtd/nand/omap-nand-flash.c
> index 63a7968..6b8fb44 100644
> --- a/drivers/mtd/nand/omap-nand-flash.c
> +++ b/drivers/mtd/nand/omap-nand-flash.c
> @@ -26,8 +26,6 @@
>  #include <asm/mach/flash.h>
>  #include <mach/tc.h>
>  
> -#include <asm/io.h>
> -#include <mach/hardware.h>
>  #include <mach/nand.h>
>  
>  #define	DRIVER_NAME	"omapnand"
> diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c
> index 24dd54f..a9885d1 100644
> --- a/drivers/mtd/onenand/omap2.c
> +++ b/drivers/mtd/onenand/omap2.c
> @@ -38,7 +38,6 @@
>  #include <mach/gpmc.h>
>  #include <mach/onenand.h>
>  #include <mach/gpio.h>
> -#include <mach/gpmc.h>
>  #include <mach/pm.h>
>  
>  #include <linux/dma-mapping.h>
> diff --git a/sound/oss/omap-audio-tsc2101.c b/sound/oss/omap-audio-tsc2101.c
> index 9cbb0e8..4931ecf 100644
> --- a/sound/oss/omap-audio-tsc2101.c
> +++ b/sound/oss/omap-audio-tsc2101.c
> @@ -39,7 +39,6 @@
>  #include <mach/hardware.h>
>  #include <mach/dma.h>
>  #include <asm/io.h>
> -#include <mach/hardware.h>
>  
>  #include <mach/mux.h>
>  #include <mach/io.h>
> -- 
> 1.5.5.1.357.g1af8b
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux