diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 05:38:27 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-05-20 05:38:27 -0400 |
| commit | c721be2807467819d16db4d61a4c5db539bcc1c7 (patch) | |
| tree | ee166b44ad37480d3f05b6a0930bd69e16c6fbf9 /arch/arm/mach-mx5/mx51_efika.c | |
| parent | 1e87347c2f6e124d73b4921c4580adad4ac534d6 (diff) | |
| parent | 27ad4bf72a27c80c121b2349174e6b41b2e3afd8 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/mach-mx5/mx51_efika.c')
| -rw-r--r-- | arch/arm/mach-mx5/mx51_efika.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-mx5/mx51_efika.c b/arch/arm/mach-mx5/mx51_efika.c index d0c7075937cf..56739c23aca7 100644 --- a/arch/arm/mach-mx5/mx51_efika.c +++ b/arch/arm/mach-mx5/mx51_efika.c | |||
| @@ -20,7 +20,6 @@ | |||
| 20 | #include <linux/input.h> | 20 | #include <linux/input.h> |
| 21 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 22 | #include <linux/io.h> | 22 | #include <linux/io.h> |
| 23 | #include <linux/fsl_devices.h> | ||
| 24 | #include <linux/spi/flash.h> | 23 | #include <linux/spi/flash.h> |
| 25 | #include <linux/spi/spi.h> | 24 | #include <linux/spi/spi.h> |
| 26 | #include <linux/mfd/mc13892.h> | 25 | #include <linux/mfd/mc13892.h> |
| @@ -30,8 +29,6 @@ | |||
| 30 | #include <mach/common.h> | 29 | #include <mach/common.h> |
| 31 | #include <mach/hardware.h> | 30 | #include <mach/hardware.h> |
| 32 | #include <mach/iomux-mx51.h> | 31 | #include <mach/iomux-mx51.h> |
| 33 | #include <mach/i2c.h> | ||
| 34 | #include <mach/mxc_ehci.h> | ||
| 35 | 32 | ||
| 36 | #include <linux/usb/otg.h> | 33 | #include <linux/usb/otg.h> |
| 37 | #include <linux/usb/ulpi.h> | 34 | #include <linux/usb/ulpi.h> |