git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
arch
/
arm
/
mach-mx5
/
mx51_efika.c
diff --git
a/arch/arm/mach-mx5/mx51_efika.c
b/arch/arm/mach-mx5/mx51_efika.c
index
d0c7075
..
56739c2
100644
(file)
--- a/
arch/arm/mach-mx5/mx51_efika.c
+++ b/
arch/arm/mach-mx5/mx51_efika.c
@@
-20,7
+20,6
@@
#include <linux/input.h>
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/input.h>
#include <linux/delay.h>
#include <linux/io.h>
-#include <linux/fsl_devices.h>
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
#include <linux/mfd/mc13892.h>
#include <linux/spi/flash.h>
#include <linux/spi/spi.h>
#include <linux/mfd/mc13892.h>
@@
-30,8
+29,6
@@
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx51.h>
#include <mach/common.h>
#include <mach/hardware.h>
#include <mach/iomux-mx51.h>
-#include <mach/i2c.h>
-#include <mach/mxc_ehci.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>