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-integrator/integrator_cp.c | |
| 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-integrator/integrator_cp.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 54edb6b8504..cde57b2b83b 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
| @@ -13,7 +13,6 @@ | |||
| 13 | #include <linux/list.h> | 13 | #include <linux/list.h> |
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/dma-mapping.h> | 15 | #include <linux/dma-mapping.h> |
| 16 | #include <linux/slab.h> | ||
| 17 | #include <linux/string.h> | 16 | #include <linux/string.h> |
| 18 | #include <linux/sysdev.h> | 17 | #include <linux/sysdev.h> |
| 19 | #include <linux/amba/bus.h> | 18 | #include <linux/amba/bus.h> |
| @@ -21,6 +20,7 @@ | |||
| 21 | #include <linux/amba/clcd.h> | 20 | #include <linux/amba/clcd.h> |
| 22 | #include <linux/amba/mmci.h> | 21 | #include <linux/amba/mmci.h> |
| 23 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/gfp.h> | ||
| 24 | 24 | ||
| 25 | #include <asm/clkdev.h> | 25 | #include <asm/clkdev.h> |
| 26 | #include <mach/clkdev.h> | 26 | #include <mach/clkdev.h> |