diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2010-06-08 07:48:26 -0600 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2010-07-18 22:39:55 -0600 |
| commit | 9e3288dc9a94fab5ea87db42177d3a9e0345a614 (patch) | |
| tree | d2b4f25677fcf9e7026040f7452c9e4f2953186c /drivers/of | |
| parent | c5f5849bffb36478dd8a1e350860ff18b654bc44 (diff) | |
| download | kernel_samsung_aries-9e3288dc9a94fab5ea87db42177d3a9e0345a614.zip kernel_samsung_aries-9e3288dc9a94fab5ea87db42177d3a9e0345a614.tar.gz kernel_samsung_aries-9e3288dc9a94fab5ea87db42177d3a9e0345a614.tar.bz2 | |
of/device: Fix build errors for non-ppc and non-microblaze
Only powerpc and microblaze supply (struct device *)->archdata.dma_mask.
This patch stops referencing it on other architectures.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/platform.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c index c52a798..9d3d932 100644 --- a/drivers/of/platform.c +++ b/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; |