Merge remote-tracking branch 'arm-soc/imx/multiplatform' into imx25-dt

This commit is contained in:
Sascha Hauer
2012-11-12 12:08:12 +01:00
217 changed files with 1083 additions and 1011 deletions

View File

@@ -24,7 +24,6 @@
#include <linux/usb/ulpi.h>
#include <linux/slab.h>
#include <mach/hardware.h>
#include <linux/platform_data/usb-ehci-mxc.h>
#include <asm/mach-types.h>