From 38dfd1e8e12b12adca9f13f2cd7fe08f430509d5 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Fri, 2 Mar 2012 21:05:31 -0700
Subject: [PATCH] --- yaml --- r: 291925 b: refs/heads/master c:
 e7cc3aca0f6a36b018934264ee20bee45dc13e29 h: refs/heads/master i:   291923:
 3a14cb4f2cd0c3739d2d2672ff38e6e4e4743f76 v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/mfd/twl-core.c      | 1 +
 trunk/include/linux/of_platform.h | 9 ++++++---
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 52566f991f74..cf29c624bad2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 280ad7fda5f95211857fda38960f2b6fdf6edd3e
+refs/heads/master: e7cc3aca0f6a36b018934264ee20bee45dc13e29
diff --git a/trunk/drivers/mfd/twl-core.c b/trunk/drivers/mfd/twl-core.c
index 4970d43952db..54727ef005d6 100644
--- a/trunk/drivers/mfd/twl-core.c
+++ b/trunk/drivers/mfd/twl-core.c
@@ -38,6 +38,7 @@
 #include <linux/of.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
+#include <linux/irq.h>
 #include <linux/irqdomain.h>
 
 #include <linux/regulator/machine.h>
diff --git a/trunk/include/linux/of_platform.h b/trunk/include/linux/of_platform.h
index 242fa3563e2e..b47d2040c9f2 100644
--- a/trunk/include/linux/of_platform.h
+++ b/trunk/include/linux/of_platform.h
@@ -94,7 +94,12 @@ extern int of_platform_populate(struct device_node *root,
 				const struct of_device_id *matches,
 				const struct of_dev_auxdata *lookup,
 				struct device *parent);
-#else
+#endif /* CONFIG_OF_ADDRESS */
+
+#endif /* CONFIG_OF_DEVICE */
+
+#if !defined(CONFIG_OF_ADDRESS)
+struct of_dev_auxdata;
 static inline int of_platform_populate(struct device_node *root,
 					const struct of_device_id *matches,
 					const struct of_dev_auxdata *lookup,
@@ -104,6 +109,4 @@ static inline int of_platform_populate(struct device_node *root,
 }
 #endif /* !CONFIG_OF_ADDRESS */
 
-#endif /* CONFIG_OF_DEVICE */
-
 #endif	/* _LINUX_OF_PLATFORM_H */