BMC/Intel-BMC/linux.git/arch/frv/include/asm/pci.h, branch dev

Merge branch 'for-4.2/sg' of git://git.kernel.dk/linux-block

2015-06-25T22:22:36+00:00

Pull asm/scatterlist.h removal from Jens Axboe: "We don't have any specific arch scatterlist anymore, since parisc finally switched over. Kill the include" * 'for-4.2/sg' of git://git.kernel.dk/linux-block: remove scatterlist.h generation from arch Kbuild files remove

PCI: Remove unused pci_dma_burst_advice()

2015-06-08T12:56:43+00:00

pci_dma_burst_advice() was added by e24c2d963a60 ("[PATCH] PCI: DMA bursting advice") but apparently never used. Remove it. Signed-off-by: Bjorn Helgaas Acked-by: Michal Simek # microblaze CC: David S. Miller

remove

2015-05-05T19:35:39+00:00

We don't have any arch specific scatterlist now that parisc switched over to the generic one. Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe

PCI: Turn pcibios_penalize_isa_irq() into a weak function

2014-05-27T22:23:58+00:00

pcibios_penalize_isa_irq() is only implemented by x86 now, and legacy ISA is not used by some architectures. Make pcibios_penalize_isa_irq() a __weak function to simplify the code. This removes the need for new platforms to add stub implementations of pcibios_penalize_isa_irq(). [bhelgaas: changelog, comments] Signed-off-by: Hanjun Guo Signed-off-by: Bjorn Helgaas Acked-by: Arnd Bergmann

Fix common misspellings

2011-03-31T14:26:23+00:00

Fixes generated by 'codespell' and manually reviewed. Signed-off-by: Lucas De Marchi

pci-dma: add linux/pci-dma.h to linux/pci.h

2010-03-12T23:52:42+00:00

All the architectures properly set NEED_DMA_MAP_STATE now so we can safely add linux/pci-dma.h to linux/pci.h and remove the linux/pci-dma.h inclusion in arch's asm/pci.h Signed-off-by: FUJITA Tomonori Acked-by: Arnd Bergmann Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

pci-dma: frv: use include/linux/pci-dma.h

2010-03-12T23:52:41+00:00

Signed-off-by: FUJITA Tomonori Acked-by: David Howells Cc: Jesse Barnes Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

frv: remove pci_dma_sync_single() and pci_dma_sync_sg()

2010-03-06T19:26:27+00:00

No architecture except for frv has pci_dma_sync_single() and pci_dma_sync_sg(). The APIs are deprecated. Signed-off-by: FUJITA Tomonori Acked-by: David S. Miller Acked-by: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds

asm-generic: merge branch 'master' of torvalds/linux-2.6

2009-06-12T09:32:58+00:00

Fixes a merge conflict against the x86 tree caused by a fix to atomic.h which I renamed to atomic_long.h. Signed-off-by: Arnd Bergmann

asm-generic: make pci.h usable directly

2009-06-11T19:02:22+00:00

Some generic code is using the horribly misnamed PCI_DMA_BUS_IS_PHYS from asm/pci.h. This makes sure that an architecture without PCI support does not have to define this itself but can rely on the asm-generic version. Signed-off-by: Remis Lima Baima Signed-off-by: Arnd Bergmann