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 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[sfrench/cifs-2.6.git]
/
drivers
/
mmc
/
host
/
mxcmmc.c
diff --git
a/drivers/mmc/host/mxcmmc.c
b/drivers/mmc/host/mxcmmc.c
index 565c2e4fac75cecd8890ec2d9885ffb50cc23060..6290b7f1ccfec2d56f31675663923e057a1570c8 100644
(file)
--- a/
drivers/mmc/host/mxcmmc.c
+++ b/
drivers/mmc/host/mxcmmc.c
@@
-1134,4
+1134,4
@@
module_platform_driver(mxcmci_driver);
MODULE_DESCRIPTION("i.MX Multimedia Card Interface Driver");
MODULE_AUTHOR("Sascha Hauer, Pengutronix");
MODULE_LICENSE("GPL");
-MODULE_ALIAS("platform:
imx
-mmc");
+MODULE_ALIAS("platform:
mxc
-mmc");