diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 10:38:27 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 10:38:27 +0100 |
commit | c721be2807467819d16db4d61a4c5db539bcc1c7 (patch) | |
tree | ee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/mach-mx5/board-cpuimx51.c | |
parent | 1e87347c2f6e124d73b4921c4580adad4ac534d6 (diff) | |
parent | 27ad4bf72a27c80c121b2349174e6b41b2e3afd8 (diff) | |
download | linux-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.gz linux-c721be2807467819d16db4d61a4c5db539bcc1c7.tar.bz2 linux-c721be2807467819d16db4d61a4c5db539bcc1c7.zip |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx5/board-cpuimx51.c')
-rw-r--r-- | arch/arm/mach-mx5/board-cpuimx51.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/board-cpuimx51.c b/arch/arm/mach-mx5/board-cpuimx51.c index d0296a94c475..4efa02ee1639 100644 --- a/arch/arm/mach-mx5/board-cpuimx51.c +++ b/arch/arm/mach-mx5/board-cpuimx51.c @@ -23,13 +23,11 @@ #include <linux/io.h> #include <linux/interrupt.h> #include <linux/irq.h> -#include <linux/fsl_devices.h> #include <mach/eukrea-baseboards.h> #include <mach/common.h> #include <mach/hardware.h> #include <mach/iomux-mx51.h> -#include <mach/mxc_ehci.h> #include <asm/irq.h> #include <asm/setup.h> |