projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge 3.5-rc7 into char-misc-next.
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
mmc
/
host
/
mxs-mmc.c
diff --git
a/drivers/mmc/host/mxs-mmc.c
b/drivers/mmc/host/mxs-mmc.c
index 34a90266ab11710d69f85c2a5648c68d1d6ec430..277161d279b8048600e6b7333d05d9c022562886 100644
(file)
--- a/
drivers/mmc/host/mxs-mmc.c
+++ b/
drivers/mmc/host/mxs-mmc.c
@@
-894,8
+894,8
@@
static struct platform_driver mxs_mmc_driver = {
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &mxs_mmc_pm_ops,
- .of_match_table = mxs_mmc_dt_ids,
#endif
+ .of_match_table = mxs_mmc_dt_ids,
},
};