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 tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[pandora-kernel.git]
/
drivers
/
mmc
/
host
/
sdhci-esdhc-imx.c
diff --git
a/drivers/mmc/host/sdhci-esdhc-imx.c
b/drivers/mmc/host/sdhci-esdhc-imx.c
index
32f4a07
..
effc2ac
100644
(file)
--- a/
drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/
drivers/mmc/host/sdhci-esdhc-imx.c
@@
-25,7
+25,7
@@
#include <linux/of_device.h>
#include <linux/of_gpio.h>
#include <linux/pinctrl/consumer.h>
-#include <
mach/esdhc
.h>
+#include <
linux/platform_data/mmc-esdhc-imx
.h>
#include "sdhci-pltfm.h"
#include "sdhci-esdhc.h"