Skip to contentSkip to conversation

arm: remove duplicated includes

PATCH Applied Nicolas Kaiser 4 participants 10 messages Oct 4, 2010 – Oct 6, 2010

Subsystems (7)
lore
Share & tools
lore
#0 lore raw

cover arm: remove duplicated includes

These patches remove duplicated includes of guarded headers.

Nicolas Kaiser (5):
arm/nomadik: remove duplicated include
arm/tegra: remove duplicated include
arm/shmobile: remove duplicated include
arm/omap: remove duplicated include
arm/davinci: remove duplicated include

#1 lore raw

PATCH 1/5 arm/nomadik: remove duplicated include

Remove duplicated include.

---
 arch/arm/plat-nomadik/include/plat/ste_dma40.h |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/plat-nomadik/include/plat/ste_dma40.h +0 -1
index 5fbde4b..93a8126 100644
@@ -14,7 +14,6 @@
 #include <linux/dmaengine.h>
 #include <linux/workqueue.h>
 #include <linux/interrupt.h>
-#include <linux/dmaengine.h>
 
 /* dev types for memcpy */
 #define STEDMA40_DEV_DST_MEMORY (-1)
Signature · 1 line
1.7.2.2
#2 lore raw

PATCH 2/5 arm/tegra: remove duplicated include

In reply to Nicolas Kaiser

Remove duplicated include.

---
 arch/arm/mach-tegra/timer.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-tegra/timer.c +0 -1
index 2f42021..9057d6f 100644
@@ -28,7 +28,6 @@
 #include <linux/cnt32_to_63.h>
 
 #include <asm/mach/time.h>
-#include <asm/mach/time.h>
 #include <asm/localtimer.h>
 
 #include <mach/iomap.h>
Signature · 1 line
1.7.2.2
#3 lore raw

PATCH 3/5 arm/shmobile: remove duplicated include

In reply to Nicolas Kaiser

Remove duplicated include.

---
 arch/arm/mach-shmobile/board-ap4evb.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-shmobile/board-ap4evb.c +0 -1
index 95935c8..3ebb5be 100644
@@ -30,7 +30,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mmc/host.h>
 #include <linux/mmc/sh_mmcif.h>
 #include <linux/i2c.h>
 #include <linux/i2c/tsc2007.h>
Signature · 1 line
1.7.2.2
Applied
#4 lore raw

Re: [PATCH 3/5] arm/shmobile: remove duplicated include

Quoted 7 lines · Nicolas Kaiser

Remove duplicated include.

---
 arch/arm/mach-shmobile/board-ap4evb.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

Applied, thanks.

#5 lore raw

PATCH 4/5 arm/omap: remove duplicated include

In reply to Nicolas Kaiser

Remove duplicated include.

---
 arch/arm/mach-omap2/board-cm-t35.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/board-cm-t35.c +0 -2
index e10bc10..3308119 100644
@@ -237,8 +237,6 @@ static inline void cm_t35_init_nand(void) {}
 	defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 #include <linux/spi/ads7846.h>
 
-#include <plat/mcspi.h>
-
 static struct omap2_mcspi_device_config ads7846_mcspi_config = {
 	.turbo_mode	= 0,
 	.single_channel	= 1,	/* 0: slave, 1: master */
Signature · 1 line
1.7.2.2
maintainer
#6 lore raw

Re: [PATCH 4/5] arm/omap: remove duplicated include

Quoted 1 line · Nicolas Kaiser

Remove duplicated include.

Thanks, adding to omap-for-linus.

Tony

maintainer
#7 lore raw

Re: [PATCH 4/5] arm/omap: remove duplicated include

In reply to Nicolas Kaiser
Quoted 1 line · Nicolas Kaiser

Remove duplicated include.

Thanks, adding into omap-for-linus.

Regards,

Tony

#8 lore raw

PATCH 5/5 arm/davinci: remove duplicated include

In reply to Nicolas Kaiser

Remove duplicated include.

---
 arch/arm/mach-davinci/board-da850-evm.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-davinci/board-da850-evm.c +0 -1
index fdc2cc5..851cc45 100644
@@ -26,7 +26,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/tps6507x.h>
-#include <linux/mfd/tps6507x.h>
 #include <linux/input/tps6507x-ts.h>
 
 #include <asm/mach-types.h>
Signature · 1 line
1.7.2.2
Applied
#9 lore raw

Re: [PATCH 5/5] arm/davinci: remove duplicated include

Quoted 3 lines · Nicolas Kaiser

Remove duplicated include.

Applied, thanks. Queuing for 2.6.37.

Kevin

Quoted 16 lines
---
 arch/arm/mach-davinci/board-da850-evm.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-davinci/board-da850-evm.c +0 -1
index fdc2cc5..851cc45 100644
@@ -26,7 +26,6 @@
 #include <linux/mtd/physmap.h>
 #include <linux/regulator/machine.h>
 #include <linux/regulator/tps6507x.h>
-#include <linux/mfd/tps6507x.h>
 #include <linux/input/tps6507x-ts.h>
 
 #include <asm/mach-types.h>