From 1ddc683d8791d6d23eb3efd54472a7ec4006edbd Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 8 Jun 2010 07:48:26 -0600
Subject: [PATCH] --- yaml --- r: 204925 b: refs/heads/master c:
 9e3288dc9a94fab5ea87db42177d3a9e0345a614 h: refs/heads/master i:   204923:
 9de45d867389117e74d7a5b2272f25722f1e9ad5 v: v3

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

diff --git a/[refs] b/[refs]
index bc1626402c35..8c63a45ceaf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5f5849bffb36478dd8a1e350860ff18b654bc44
+refs/heads/master: 9e3288dc9a94fab5ea87db42177d3a9e0345a614
diff --git a/trunk/drivers/of/platform.c b/trunk/drivers/of/platform.c
index c52a798684a9..9d3d932bcb6f 100644
--- a/trunk/drivers/of/platform.c
+++ b/trunk/drivers/of/platform.c
@@ -16,7 +16,9 @@
 #include <linux/device.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
+#include <linux/of_address.h>
 #include <linux/of_device.h>
+#include <linux/of_irq.h>
 #include <linux/of_platform.h>
 
 #if defined(CONFIG_PPC_DCR)
@@ -511,7 +513,9 @@ struct of_device *of_device_alloc(struct device_node *np,
 	}
 
 	dev->dev.of_node = of_node_get(np);
+#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
 	dev->dev.dma_mask = &dev->archdata.dma_mask;
+#endif
 	dev->dev.parent = parent;
 	dev->dev.release = of_release_dev;
 
@@ -540,7 +544,9 @@ struct of_device *of_platform_device_create(struct device_node *np,
 	if (!dev)
 		return NULL;
 
+#if defined(CONFIG_PPC) || defined(CONFIG_MICROBLAZE)
 	dev->archdata.dma_mask = 0xffffffffUL;
+#endif
 	dev->dev.coherent_dma_mask = DMA_BIT_MASK(32);
 	dev->dev.bus = &of_platform_bus_type;