diff options
| author | David S. Miller <davem@davemloft.net> | 2008-08-27 19:54:01 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-08-29 02:15:23 -0700 |
| commit | 9dc69230a96a84ca8e6eef89cd34fad0dd8a1a09 (patch) | |
| tree | cff214cd128925a637858a5a0e98e29e1699a38f /arch/sparc/include | |
| parent | 0ad626a2a4c3d8e565b3a6f10eeda5b43560fbdb (diff) | |
| download | blackbird-op-linux-9dc69230a96a84ca8e6eef89cd34fad0dd8a1a09.tar.gz blackbird-op-linux-9dc69230a96a84ca8e6eef89cd34fad0dd8a1a09.zip | |
sparc: Kill now spurious includes of sbus.h
In order to make this week I also had to add an include
of linux/dma-mapping.h to asm/pci_32.h because drivers/pci/pci.c
really depends upon getting this header somehow.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include')
| -rw-r--r-- | arch/sparc/include/asm/dma.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/pci_32.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/dma.h b/arch/sparc/include/asm/dma.h index d1ae56be9fa6..b554927bbaf6 100644 --- a/arch/sparc/include/asm/dma.h +++ b/arch/sparc/include/asm/dma.h @@ -91,8 +91,6 @@ extern int isa_dma_bridge_buggy; #ifdef CONFIG_SPARC32 -#include <asm/sbus.h> - /* Routines for data transfer buffers. */ BTFIXUPDEF_CALL(char *, mmu_lockarea, char *, unsigned long) BTFIXUPDEF_CALL(void, mmu_unlockarea, char *, unsigned long) diff --git a/arch/sparc/include/asm/pci_32.h b/arch/sparc/include/asm/pci_32.h index 0ee949d220c0..b41c4c198159 100644 --- a/arch/sparc/include/asm/pci_32.h +++ b/arch/sparc/include/asm/pci_32.h @@ -3,6 +3,8 @@ #ifdef __KERNEL__ +#include <linux/dma-mapping.h> + /* Can be used to override the logic in pci_scan_bus for skipping * already-configured bus numbers - to be used for buggy BIOSes * or architectures with incomplete PCI setup by the loader. |
