diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-23 14:28:04 -0400 |
| commit | 9a55d9752d8abfc62f1ab05ccc790d22a0c8e7c0 (patch) | |
| tree | 894bb6a3fb409c6ac5f0374f5a1f656918bc35cd /arch/arm/mach-mx5/board-cpuimx51sd.c | |
| parent | ec19628d72cff8f80220b7cedba089074ac6a599 (diff) | |
| parent | dc7ad3b3d5f1cd0a0d16c05dd3ad3898979d261e (diff) | |
Merge branch 'devel-stable' into for-linus
Conflicts:
arch/arm/Kconfig
arch/arm/mach-ns9xxx/include/mach/uncompress.h
Diffstat (limited to 'arch/arm/mach-mx5/board-cpuimx51sd.c')
| -rw-r--r-- | arch/arm/mach-mx5/board-cpuimx51sd.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/board-cpuimx51sd.c b/arch/arm/mach-mx5/board-cpuimx51sd.c index 29b180823bf5..5ef25a596143 100644 --- a/arch/arm/mach-mx5/board-cpuimx51sd.c +++ b/arch/arm/mach-mx5/board-cpuimx51sd.c | |||
| @@ -23,7 +23,6 @@ | |||
| 23 | #include <linux/io.h> | 23 | #include <linux/io.h> |
| 24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
| 25 | #include <linux/irq.h> | 25 | #include <linux/irq.h> |
| 26 | #include <linux/fsl_devices.h> | ||
| 27 | #include <linux/i2c-gpio.h> | 26 | #include <linux/i2c-gpio.h> |
| 28 | #include <linux/spi/spi.h> | 27 | #include <linux/spi/spi.h> |
| 29 | #include <linux/can/platform/mcp251x.h> | 28 | #include <linux/can/platform/mcp251x.h> |
| @@ -32,7 +31,6 @@ | |||
| 32 | #include <mach/common.h> | 31 | #include <mach/common.h> |
| 33 | #include <mach/hardware.h> | 32 | #include <mach/hardware.h> |
| 34 | #include <mach/iomux-mx51.h> | 33 | #include <mach/iomux-mx51.h> |
| 35 | #include <mach/mxc_ehci.h> | ||
| 36 | 34 | ||
| 37 | #include <asm/irq.h> | 35 | #include <asm/irq.h> |
| 38 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |