Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9dc69230 authored Aug 27, 2008 by David S. Miller

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>

parent 0ad626a2

arch/sparc/include/asm/dma.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)

arch/sparc/include/asm/pci_32.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -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.

arch/sparc/kernel/ioport.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@
		#include <asm/vaddrs.h>
		#include <asm/oplib.h>
		#include <asm/prom.h>
		#include <asm/sbus.h>
		#include <asm/page.h>
		#include <asm/pgalloc.h>
		#include <asm/dma.h>

arch/sparc/kernel/pcic.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@
		#include <linux/jiffies.h>

		#include <asm/ebus.h>
		#include <asm/sbus.h> /* for sanity check... */
		#include <asm/swift.h> /* for cache flushing. */
		#include <asm/io.h>

arch/sparc/kernel/sparc_ksyms.c

+0 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,6 @@
		#include <asm/uaccess.h>
		#include <asm/checksum.h>
		#ifdef CONFIG_SBUS
		#include <asm/sbus.h>
		#include <asm/dma.h>
		#endif
		#ifdef CONFIG_PCI