Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into...

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

diff --cc arch/microblaze/include/asm/pci.h
index 3355240,dea209c..468aca8
--- 1/arch/microblaze/include/asm/pci.h
--- 2/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@@ -44,14 -44,11 +44,6 @@@ struct pci_dev
   */
  #define pcibios_assign_all_busses()   0
  
- #ifdef CONFIG_PCI
- extern void set_pci_dma_ops(struct dma_map_ops *dma_ops);
- extern struct dma_map_ops *get_pci_dma_ops(void);
- #else /* CONFIG_PCI */
- #define set_pci_dma_ops(d)
- #define get_pci_dma_ops()     NULL
- #endif
 -static inline void pcibios_penalize_isa_irq(int irq, int active)
 -{
 -      /* We don't do dynamic PCI IRQ allocation */
 -}
--
  #ifdef CONFIG_PCI
  static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                        enum pci_dma_burst_strategy *strat,

diff --cc arch/microblaze/pci/pci-common.c
Simple merge

diff --cc drivers/of/platform.c
Simple merge