---

yaml --- r: 204925 b: refs/heads/master c: 9e3288d h: refs/heads/master i: 204923: 9de45d8 v: v3
git-mirror · Jul 19, 2010 · 1ddc683 · 1ddc683
1 parent 7d4dafd
commit 1ddc683
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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;