diff options
author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:15:02 -0700 |
commit | ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8 (patch) | |
tree | 3ca115b6580b70b20d21da179f004b14f54edc8e /drivers/mmc/host/omap_hsmmc.c | |
parent | 17a505edb09495510ac8998450980472c412455b (diff) | |
parent | 9cf1c871526cf6bfec2a653e1e068ee72592542c (diff) | |
download | linux-3.10-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.gz linux-3.10-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.tar.bz2 linux-3.10-ed0a0ed0a4e0e6eeebfa154f97ebb41abc5bbee8.zip |
Merge branch 'next/cleanup' into HEAD
Conflicts:
drivers/staging/tidspbridge/core/wdt.c
drivers/usb/host/Kconfig
drivers/w1/masters/omap_hdq.c
Diffstat (limited to 'drivers/mmc/host/omap_hsmmc.c')
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 8e2d81f1ee4..38adc330c00 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -40,7 +40,6 @@ #include <linux/regulator/consumer.h> #include <linux/pm_runtime.h> #include <mach/hardware.h> -#include <plat/board.h> #include <plat/mmc.h> #include <plat/cpu.h> |