From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Jun 2014 23:15:33 +0000 (-0700)
Subject: Merge tag 'microblaze-3.16-rc1' of git://git.monstr.eu/linux-2.6-microblaze into... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2b03adc1911d1c84cb7fad8b424234f589547cb3;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

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
---

2b03adc1911d1c84cb7fad8b424234f589547cb3
diff --cc arch/microblaze/include/asm/pci.h
index 335524040fff,dea209cccf7f..468aca8cec0d
--- a/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,