diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-05-17 12:24:04 -0400 |
| commit | ac1d426e825ab5778995f2f6f053ca2e6b45c622 (patch) | |
| tree | 75b91356ca39463e0112931aa6790802fb1e07a2 /arch/arm/mach-ixp4xx | |
| parent | fda0e18c8a7a3e02747c2b045b4fcd2c920410b9 (diff) | |
| parent | a3685f00652af83f12b63e3b4ef48f29581ba48b (diff) | |
Merge branch 'devel-stable' into devel
Conflicts:
arch/arm/Kconfig
arch/arm/include/asm/system.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/mach-ixp4xx')
| -rw-r--r-- | arch/arm/mach-ixp4xx/avila-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/coyote-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/gateway7001-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/gtwx5715-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/ixp4xx_npe.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-ixp4xx/wg302v2-setup.c | 1 |
7 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/mach-ixp4xx/avila-setup.c b/arch/arm/mach-ixp4xx/avila-setup.c index 6e558a76457d..d8bc86d76f1d 100644 --- a/arch/arm/mach-ixp4xx/avila-setup.c +++ b/arch/arm/mach-ixp4xx/avila-setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
| 18 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
| 19 | #include <linux/serial_8250.h> | 19 | #include <linux/serial_8250.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | #include <linux/i2c-gpio.h> | 20 | #include <linux/i2c-gpio.h> |
| 22 | #include <asm/types.h> | 21 | #include <asm/types.h> |
| 23 | #include <asm/setup.h> | 22 | #include <asm/setup.h> |
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c index 25bf5ad770ea..31a47f6a8939 100644 --- a/arch/arm/mach-ixp4xx/coyote-setup.c +++ b/arch/arm/mach-ixp4xx/coyote-setup.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/serial.h> | 14 | #include <linux/serial.h> |
| 15 | #include <linux/tty.h> | 15 | #include <linux/tty.h> |
| 16 | #include <linux/serial_8250.h> | 16 | #include <linux/serial_8250.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | 17 | ||
| 19 | #include <asm/types.h> | 18 | #include <asm/types.h> |
| 20 | #include <asm/setup.h> | 19 | #include <asm/setup.h> |
diff --git a/arch/arm/mach-ixp4xx/gateway7001-setup.c b/arch/arm/mach-ixp4xx/gateway7001-setup.c index 59b73a0ddfa9..2583b2a13174 100644 --- a/arch/arm/mach-ixp4xx/gateway7001-setup.c +++ b/arch/arm/mach-ixp4xx/gateway7001-setup.c | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #include <linux/serial.h> | 17 | #include <linux/serial.h> |
| 18 | #include <linux/tty.h> | 18 | #include <linux/tty.h> |
| 19 | #include <linux/serial_8250.h> | 19 | #include <linux/serial_8250.h> |
| 20 | #include <linux/slab.h> | ||
| 21 | 20 | ||
| 22 | #include <asm/types.h> | 21 | #include <asm/types.h> |
| 23 | #include <asm/setup.h> | 22 | #include <asm/setup.h> |
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c index 0bc7185cb6f7..c67586b79400 100644 --- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c +++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/serial.h> | 27 | #include <linux/serial.h> |
| 28 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
| 29 | #include <linux/serial_8250.h> | 29 | #include <linux/serial_8250.h> |
| 30 | #include <linux/slab.h> | ||
| 31 | #include <asm/types.h> | 30 | #include <asm/types.h> |
| 32 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
| 33 | #include <asm/memory.h> | 32 | #include <asm/memory.h> |
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c index bbb768988845..827cbc4402f4 100644 --- a/arch/arm/mach-ixp4xx/ixdp425-setup.c +++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/serial.h> | 14 | #include <linux/serial.h> |
| 15 | #include <linux/tty.h> | 15 | #include <linux/tty.h> |
| 16 | #include <linux/serial_8250.h> | 16 | #include <linux/serial_8250.h> |
| 17 | #include <linux/slab.h> | ||
| 18 | #include <linux/i2c-gpio.h> | 17 | #include <linux/i2c-gpio.h> |
| 19 | #include <linux/io.h> | 18 | #include <linux/io.h> |
| 20 | #include <linux/mtd/mtd.h> | 19 | #include <linux/mtd/mtd.h> |
diff --git a/arch/arm/mach-ixp4xx/ixp4xx_npe.c b/arch/arm/mach-ixp4xx/ixp4xx_npe.c index e8bb25778166..a17ed79207a4 100644 --- a/arch/arm/mach-ixp4xx/ixp4xx_npe.c +++ b/arch/arm/mach-ixp4xx/ixp4xx_npe.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/io.h> | 20 | #include <linux/io.h> |
| 21 | #include <linux/kernel.h> | 21 | #include <linux/kernel.h> |
| 22 | #include <linux/module.h> | 22 | #include <linux/module.h> |
| 23 | #include <linux/slab.h> | ||
| 24 | #include <mach/npe.h> | 23 | #include <mach/npe.h> |
| 25 | 24 | ||
| 26 | #define DEBUG_MSG 0 | 25 | #define DEBUG_MSG 0 |
diff --git a/arch/arm/mach-ixp4xx/wg302v2-setup.c b/arch/arm/mach-ixp4xx/wg302v2-setup.c index 7ea782021d1f..4dd74863daa9 100644 --- a/arch/arm/mach-ixp4xx/wg302v2-setup.c +++ b/arch/arm/mach-ixp4xx/wg302v2-setup.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/serial.h> | 18 | #include <linux/serial.h> |
| 19 | #include <linux/tty.h> | 19 | #include <linux/tty.h> |
| 20 | #include <linux/serial_8250.h> | 20 | #include <linux/serial_8250.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | 21 | ||
| 23 | #include <asm/types.h> | 22 | #include <asm/types.h> |
| 24 | #include <asm/setup.h> | 23 | #include <asm/setup.h> |