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/mm | |
| parent | 0ad626a2a4c3d8e565b3a6f10eeda5b43560fbdb (diff) | |
| download | op-kernel-dev-9dc69230a96a84ca8e6eef89cd34fad0dd8a1a09.zip op-kernel-dev-9dc69230a96a84ca8e6eef89cd34fad0dd8a1a09.tar.gz | |
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/mm')
| -rw-r--r-- | arch/sparc/mm/io-unit.c | 3 | ||||
| -rw-r--r-- | arch/sparc/mm/iommu.c | 3 | ||||
| -rw-r--r-- | arch/sparc/mm/nosrmmu.c | 1 | ||||
| -rw-r--r-- | arch/sparc/mm/srmmu.c | 1 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/mm/io-unit.c b/arch/sparc/mm/io-unit.c index 5390023..daadf5f 100644 --- a/arch/sparc/mm/io-unit.c +++ b/arch/sparc/mm/io-unit.c @@ -12,10 +12,11 @@ #include <linux/highmem.h> /* pte_offset_map => kmap_atomic */ #include <linux/bitops.h> #include <linux/scatterlist.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> -#include <asm/sbus.h> #include <asm/io.h> #include <asm/io-unit.h> #include <asm/mxcc.h> diff --git a/arch/sparc/mm/iommu.c b/arch/sparc/mm/iommu.c index 7c55450..e7a499e 100644 --- a/arch/sparc/mm/iommu.c +++ b/arch/sparc/mm/iommu.c @@ -13,10 +13,11 @@ #include <linux/slab.h> #include <linux/highmem.h> /* pte_offset_map => kmap_atomic */ #include <linux/scatterlist.h> +#include <linux/of.h> +#include <linux/of_device.h> #include <asm/pgalloc.h> #include <asm/pgtable.h> -#include <asm/sbus.h> #include <asm/io.h> #include <asm/mxcc.h> #include <asm/mbus.h> diff --git a/arch/sparc/mm/nosrmmu.c b/arch/sparc/mm/nosrmmu.c index 3701f70..4f061bb 100644 --- a/arch/sparc/mm/nosrmmu.c +++ b/arch/sparc/mm/nosrmmu.c @@ -9,7 +9,6 @@ #include <linux/mm.h> #include <linux/init.h> #include <asm/mbus.h> -#include <asm/sbus.h> static char shouldnothappen[] __initdata = "SUN4 kernel can only run on SUN4\n"; diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index ee30462..6a5d7ca 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c @@ -31,7 +31,6 @@ #include <asm/mbus.h> #include <asm/cache.h> #include <asm/oplib.h> -#include <asm/sbus.h> #include <asm/asi.h> #include <asm/msi.h> #include <asm/mmu_context.h> |
