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
This commit is contained in:
@@ -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)
|
||||
|
Reference in New Issue
Block a user