aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mmc
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2012-05-08 08:59:38 -0400
committerChris Ball <cjb@laptop.org>2012-05-08 10:36:52 -0400
commitc0a120a4bc68f5dc5f5238e76013cc18bac0ffed (patch)
tree45fa417548b88e992e11fe2f54c99ec9c6972693 /drivers/mmc
parent9a597016058520665452390df919428e4edd7770 (diff)
mmc: mmci: Fix compiler error when CONFIG_OF is not set
error: implicit declaration of function 'mmci_dt_populate_generic_pdata' This is due to the '#if CONFIG_OF' guards placed around mmci_dt_populate_generic_pdata(), but not around the call to it. We repair this by inserting a stub which elegantly returns when CONFIG_OF is not set. Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Lee Jones <lee.jones@linaro.org> Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
-rw-r--r--drivers/mmc/host/mmci.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 2303a16263ef..efc822df4b75 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
1241 pr_warn("%s: Unsupported bus width\n", np->full_name); 1241 pr_warn("%s: Unsupported bus width\n", np->full_name);
1242 } 1242 }
1243} 1243}
1244#else
1245static void mmci_dt_populate_generic_pdata(struct device_node *np,
1246 struct mmci_platform_data *pdata)
1247{
1248 return;
1249}
1244#endif 1250#endif
1245 1251
1246static int __devinit mmci_probe(struct amba_device *dev, 1252static int __devinit mmci_probe(struct amba_device *dev,