diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-03 17:39:34 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-03 17:39:34 +0000 |
| commit | 78ff18a412da24a4b79c6a97000ef5e467e813da (patch) | |
| tree | 901d67dc2c709b71fba37b37b901ea167cef21a2 /arch/arm | |
| parent | 9d4f13e531b4722fe40cc8e28c02a495bdd49267 (diff) | |
[ARM] Cleanup ARM includes
arch/arm/kernel/entry-armv.S has contained a comment suggesting
that asm/hardware.h and asm/arch/irqs.h should be moved into the
asm/arch/entry-macro.S include. So move the includes to these
two files as required.
Add missing includes (asm/hardware.h, asm/io.h) to asm/arch/system.h
includes which use those facilities, and remove asm/io.h from
kernel/process.c.
Remove other unnecessary includes from arch/arm/kernel, arch/arm/mm
and arch/arm/mach-footbridge.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/kernel/dma.c | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/process.c | 3 | ||||
| -rw-r--r-- | arch/arm/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/arm/kernel/time.c | 3 | ||||
| -rw-r--r-- | arch/arm/kernel/traps.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-footbridge/dma.c | 1 | ||||
| -rw-r--r-- | arch/arm/mm/consistent.c | 1 | ||||
| -rw-r--r-- | arch/arm/mm/discontig.c | 4 | ||||
| -rw-r--r-- | arch/arm/mm/mm-armv.c | 1 |
10 files changed, 3 insertions, 17 deletions
diff --git a/arch/arm/kernel/dma.c b/arch/arm/kernel/dma.c index 2b7883884234..8d6381cd8915 100644 --- a/arch/arm/kernel/dma.c +++ b/arch/arm/kernel/dma.c @@ -12,8 +12,6 @@ * DMA facilities. */ #include <linux/module.h> -#include <linux/slab.h> -#include <linux/mman.h> #include <linux/init.h> #include <linux/spinlock.h> #include <linux/errno.h> diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 2a8d27e18fa7..a52baedf6262 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -18,8 +18,6 @@ #include <asm/memory.h> #include <asm/glue.h> #include <asm/vfpmacros.h> -#include <asm/hardware.h> /* should be moved into entry-macro.S */ -#include <asm/arch/irqs.h> /* should be moved into entry-macro.S */ #include <asm/arch/entry-macro.S> #include "entry-header.S" diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index 30494aab829a..54a21bdcba5c 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -28,10 +28,9 @@ #include <linux/init.h> #include <linux/cpu.h> -#include <asm/system.h> -#include <asm/io.h> #include <asm/leds.h> #include <asm/processor.h> +#include <asm/system.h> #include <asm/uaccess.h> #include <asm/mach/time.h> diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 85774165e9fd..2cab741ad0f8 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -26,8 +26,6 @@ #include <asm/cpu.h> #include <asm/elf.h> -#include <asm/hardware.h> -#include <asm/io.h> #include <asm/procinfo.h> #include <asm/setup.h> #include <asm/mach-types.h> diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c index fc4729106a32..d7d932c02866 100644 --- a/arch/arm/kernel/time.c +++ b/arch/arm/kernel/time.c @@ -29,9 +29,6 @@ #include <linux/sysdev.h> #include <linux/timer.h> -#include <asm/hardware.h> -#include <asm/io.h> -#include <asm/irq.h> #include <asm/leds.h> #include <asm/thread_info.h> #include <asm/mach/time.h> diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 45e9ea6cd2a5..c9fe6f5f7ee3 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -23,7 +23,6 @@ #include <asm/atomic.h> #include <asm/cacheflush.h> -#include <asm/io.h> #include <asm/system.h> #include <asm/uaccess.h> #include <asm/unistd.h> diff --git a/arch/arm/mach-footbridge/dma.c b/arch/arm/mach-footbridge/dma.c index a6b1396b0951..7a54578b51af 100644 --- a/arch/arm/mach-footbridge/dma.c +++ b/arch/arm/mach-footbridge/dma.c @@ -15,6 +15,7 @@ #include <asm/dma.h> #include <asm/io.h> +#include <asm/scatterlist.h> #include <asm/mach/dma.h> #include <asm/hardware/dec21285.h> diff --git a/arch/arm/mm/consistent.c b/arch/arm/mm/consistent.c index dbfe9e891f01..0513ed1b2fcf 100644 --- a/arch/arm/mm/consistent.c +++ b/arch/arm/mm/consistent.c @@ -19,7 +19,6 @@ #include <linux/dma-mapping.h> #include <asm/cacheflush.h> -#include <asm/io.h> #include <asm/tlbflush.h> #define CONSISTENT_BASE (0xffc00000) diff --git a/arch/arm/mm/discontig.c b/arch/arm/mm/discontig.c index 0d097bb1bc4d..1e5602189507 100644 --- a/arch/arm/mm/discontig.c +++ b/arch/arm/mm/discontig.c @@ -9,10 +9,8 @@ * it under the terms of the GNU General Public License version 2 as * published by the Free Software Foundation. */ - #include <linux/module.h> -#include <linux/mm.h> -#include <linux/init.h> +#include <linux/mmzone.h> #include <linux/bootmem.h> #if MAX_NUMNODES != 4 && MAX_NUMNODES != 16 diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c index 9e50127be635..d0245a31d4dd 100644 --- a/arch/arm/mm/mm-armv.c +++ b/arch/arm/mm/mm-armv.c @@ -19,7 +19,6 @@ #include <asm/pgalloc.h> #include <asm/page.h> -#include <asm/io.h> #include <asm/setup.h> #include <asm/tlbflush.h> |