From 7dbe8772205f7329a8a95328a0e5f6c55474ac67 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Tue, 8 May 2012 13:59:38 +0100
Subject: [PATCH] --- yaml --- r: 307953 b: refs/heads/master c:
 c0a120a4bc68f5dc5f5238e76013cc18bac0ffed h: refs/heads/master i:   307951:
 bab495c72e6673b924b04f8b159a3c3e116f9296 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/mmc/host/mmci.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1062fcef45c0..8a0a613ec04f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9a597016058520665452390df919428e4edd7770
+refs/heads/master: c0a120a4bc68f5dc5f5238e76013cc18bac0ffed
diff --git a/trunk/drivers/mmc/host/mmci.c b/trunk/drivers/mmc/host/mmci.c
index 2303a16263ef..efc822df4b75 100644
--- a/trunk/drivers/mmc/host/mmci.c
+++ b/trunk/drivers/mmc/host/mmci.c
@@ -1241,6 +1241,12 @@ static void mmci_dt_populate_generic_pdata(struct device_node *np,
 		pr_warn("%s: Unsupported bus width\n", np->full_name);
 	}
 }
+#else
+static void mmci_dt_populate_generic_pdata(struct device_node *np,
+					struct mmci_platform_data *pdata)
+{
+	return;
+}
 #endif
 
 static int __devinit mmci_probe(struct amba_device *dev,