git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
drivers
/
mmc
/
host
/
pxamci.c
diff --git
a/drivers/mmc/host/pxamci.c
b/drivers/mmc/host/pxamci.c
index c1d3f0e3892131a46192a68e12807d39b1a36c69..e7d80c83da2c837f6b85a49b2eef4f1377425048 100644
(file)
--- a/
drivers/mmc/host/pxamci.c
+++ b/
drivers/mmc/host/pxamci.c
@@
-35,7
+35,7
@@
#include <linux/of.h>
#include <linux/of_device.h>
-#include <
asm
/sizes.h>
+#include <
linux
/sizes.h>
#include <mach/hardware.h>
#include <linux/platform_data/mmc-pxamci.h>