OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clock' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[uclinux-h8/linux.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
6b0e3f3
..
ebbe984
100644
(file)
--- a/
drivers/mmc/host/sdhci-esdhc-imx.c
+++ b/
drivers/mmc/host/sdhci-esdhc-imx.c
@@
-407,7
+407,7
@@
sdhci_esdhc_imx_probe_dt(struct platform_device *pdev,
if (!np)
return -ENODEV;
- if (of_get_property(np, "
fsl,card-wired
", NULL))
+ if (of_get_property(np, "
non-removable
", NULL))
boarddata->cd_type = ESDHC_CD_PERMANENT;
if (of_get_property(np, "fsl,cd-controller", NULL))