summaryrefslogtreecommitdiffstats
path: root/drivers/of/platform.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-06-05 16:15:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-06-05 16:15:33 -0700
commit2b03adc1911d1c84cb7fad8b424234f589547cb3 (patch)
treeca817632d166046bbfe917894afd99c698d47627 /drivers/of/platform.c
parenteb3d3ec567e868c8a3bfbfdfc9465ffd52983d11 (diff)
parent225fba216261b0e24273f5f4eee504e3c7bd0255 (diff)
downloadlinux-2b03adc1911d1c84cb7fad8b424234f589547cb3.tar.bz2
Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into next
Pull Microblaze updates from Michal Simek: - cleanup PCI and DMA handling - use generic device.h - some cleanups * tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Fix typo in head.S s/substract/subtract/ microblaze: remove check for CONFIG_XILINX_CONSOLE microblaze: Use generic device.h microblaze: Do not setup empty unmap_sg function microblaze: Remove device_to_mask microblaze: Clean device dma_ops structure microblaze: Cleanup PCI_DRAM_OFFSET handling microblaze: Do not setup pci_dma_ops microblaze: Return default dma operations microblaze: Enable SERIAL_OF_PLATFORM
Diffstat (limited to 'drivers/of/platform.c')
-rw-r--r--drivers/of/platform.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d90a02d89f51..6c48d73a7fd7 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -138,9 +138,6 @@ struct platform_device *of_device_alloc(struct device_node *np,
}
dev->dev.of_node = of_node_get(np);
-#if defined(CONFIG_MICROBLAZE)
- dev->dev.dma_mask = &dev->archdata.dma_mask;
-#endif
dev->dev.parent = parent;
if (bus_id)