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/sparc64 | |
| 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/sparc64')
| -rw-r--r-- | arch/sparc64/kernel/irq.c | 1 | ||||
| -rw-r--r-- | arch/sparc64/kernel/sbus.c | 4 | ||||
| -rw-r--r-- | arch/sparc64/kernel/sparc64_ksyms.c | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c index 9b6689d9d570..2817a272b4cf 100644 --- a/arch/sparc64/kernel/irq.c +++ b/arch/sparc64/kernel/irq.c @@ -28,7 +28,6 @@ #include <asm/system.h> #include <asm/irq.h> #include <asm/io.h> -#include <asm/sbus.h> #include <asm/iommu.h> #include <asm/upa.h> #include <asm/oplib.h> diff --git a/arch/sparc64/kernel/sbus.c b/arch/sparc64/kernel/sbus.c index 60605eaf49bb..9d7dfb8cc27a 100644 --- a/arch/sparc64/kernel/sbus.c +++ b/arch/sparc64/kernel/sbus.c @@ -11,15 +11,17 @@ #include <linux/slab.h> #include <linux/init.h> #include <linux/interrupt.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/page.h> -#include <asm/sbus.h> #include <asm/io.h> #include <asm/upa.h> #include <asm/cache.h> #include <asm/dma.h> #include <asm/irq.h> #include <asm/prom.h> +#include <asm/oplib.h> #include <asm/starfire.h> #include "iommu_common.h" diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c index 08c58a8457bc..142c16983d14 100644 --- a/arch/sparc64/kernel/sparc64_ksyms.c +++ b/arch/sparc64/kernel/sparc64_ksyms.c @@ -44,7 +44,6 @@ #include <asm/pgalloc.h> #include <asm/cacheflush.h> #ifdef CONFIG_SBUS -#include <asm/sbus.h> #include <asm/dma.h> #endif #ifdef CONFIG_PCI |
