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-iop32x | |
| 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-iop32x')
| -rw-r--r-- | arch/arm/mach-iop32x/glantank.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-iop32x/iq31244.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-iop32x/iq80321.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 1 |
4 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-iop32x/glantank.c b/arch/arm/mach-iop32x/glantank.c index 93370a46b620..10384fc37cb2 100644 --- a/arch/arm/mach-iop32x/glantank.c +++ b/arch/arm/mach-iop32x/glantank.c | |||
| @@ -19,7 +19,6 @@ | |||
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/pm.h> | 20 | #include <linux/pm.h> |
| 21 | #include <linux/string.h> | 21 | #include <linux/string.h> |
| 22 | #include <linux/slab.h> | ||
| 23 | #include <linux/serial_core.h> | 22 | #include <linux/serial_core.h> |
| 24 | #include <linux/serial_8250.h> | 23 | #include <linux/serial_8250.h> |
| 25 | #include <linux/mtd/physmap.h> | 24 | #include <linux/mtd/physmap.h> |
diff --git a/arch/arm/mach-iop32x/iq31244.c b/arch/arm/mach-iop32x/iq31244.c index a7a08dda7f33..d6ac85ff109d 100644 --- a/arch/arm/mach-iop32x/iq31244.c +++ b/arch/arm/mach-iop32x/iq31244.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | #include <linux/pm.h> | 22 | #include <linux/pm.h> |
| 23 | #include <linux/string.h> | 23 | #include <linux/string.h> |
| 24 | #include <linux/slab.h> | ||
| 25 | #include <linux/serial_core.h> | 24 | #include <linux/serial_core.h> |
| 26 | #include <linux/serial_8250.h> | 25 | #include <linux/serial_8250.h> |
| 27 | #include <linux/mtd/physmap.h> | 26 | #include <linux/mtd/physmap.h> |
diff --git a/arch/arm/mach-iop32x/iq80321.c b/arch/arm/mach-iop32x/iq80321.c index 0200f80c1e17..c6a0e4ee9d91 100644 --- a/arch/arm/mach-iop32x/iq80321.c +++ b/arch/arm/mach-iop32x/iq80321.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/kernel.h> | 18 | #include <linux/kernel.h> |
| 19 | #include <linux/pci.h> | 19 | #include <linux/pci.h> |
| 20 | #include <linux/string.h> | 20 | #include <linux/string.h> |
| 21 | #include <linux/slab.h> | ||
| 22 | #include <linux/serial_core.h> | 21 | #include <linux/serial_core.h> |
| 23 | #include <linux/serial_8250.h> | 22 | #include <linux/serial_8250.h> |
| 24 | #include <linux/mtd/physmap.h> | 23 | #include <linux/mtd/physmap.h> |
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 266b1f58a784..f108a31afc2b 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
| 24 | #include <linux/pm.h> | 24 | #include <linux/pm.h> |
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/slab.h> | ||
| 27 | #include <linux/serial_core.h> | 26 | #include <linux/serial_core.h> |
| 28 | #include <linux/serial_8250.h> | 27 | #include <linux/serial_8250.h> |
| 29 | #include <linux/mtd/physmap.h> | 28 | #include <linux/mtd/physmap.h> |