diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 13:52:45 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 13:52:45 +0000 |
| commit | a62c80e559809e6c7851ec04d30575e85ad6f6ed (patch) | |
| tree | 7d91fd1f5186ad0d95498f65acfa5a10942133d6 /arch/arm/mach-versatile | |
| parent | 6351610d6906aacbf9176cbdd045dd3876eec4c0 (diff) | |
| download | op-kernel-dev-a62c80e559809e6c7851ec04d30575e85ad6f6ed.zip op-kernel-dev-a62c80e559809e6c7851ec04d30575e85ad6f6ed.tar.gz | |
[ARM] Move AMBA include files to include/linux/amba/
Since the ARM AMBA bus is used on MIPS as well as ARM, we need
to make the bus available for other architectures to use. Move
the AMBA include files from include/asm-arm/hardware/ to
include/linux/amba/
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-versatile')
| -rw-r--r-- | arch/arm/mach-versatile/core.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/core.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/versatile_ab.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-versatile/versatile_pb.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index a1ca466..9002374 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c @@ -25,14 +25,14 @@ #include <linux/platform_device.h> #include <linux/sysdev.h> #include <linux/interrupt.h> +#include <linux/amba/bus.h> +#include <linux/amba/clcd.h> #include <asm/system.h> #include <asm/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/leds.h> -#include <asm/hardware/amba.h> -#include <asm/hardware/amba_clcd.h> #include <asm/hardware/arm_timer.h> #include <asm/hardware/icst307.h> diff --git a/arch/arm/mach-versatile/core.h b/arch/arm/mach-versatile/core.h index 588c206..afcaa85 100644 --- a/arch/arm/mach-versatile/core.h +++ b/arch/arm/mach-versatile/core.h @@ -22,7 +22,7 @@ #ifndef __ASM_ARCH_VERSATILE_H #define __ASM_ARCH_VERSATILE_H -#include <asm/hardware/amba.h> +#include <linux/amba/bus.h> extern void __init versatile_init(void); extern void __init versatile_init_irq(void); diff --git a/arch/arm/mach-versatile/versatile_ab.c b/arch/arm/mach-versatile/versatile_ab.c index 8b0b3be..e74c8a2 100644 --- a/arch/arm/mach-versatile/versatile_ab.c +++ b/arch/arm/mach-versatile/versatile_ab.c @@ -23,12 +23,12 @@ #include <linux/init.h> #include <linux/device.h> #include <linux/sysdev.h> +#include <linux/amba/bus.h> #include <asm/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <asm/hardware/amba.h> #include <asm/mach/arch.h> diff --git a/arch/arm/mach-versatile/versatile_pb.c b/arch/arm/mach-versatile/versatile_pb.c index 7c3078c..22d5ca0 100644 --- a/arch/arm/mach-versatile/versatile_pb.c +++ b/arch/arm/mach-versatile/versatile_pb.c @@ -23,12 +23,12 @@ #include <linux/init.h> #include <linux/device.h> #include <linux/sysdev.h> +#include <linux/amba/bus.h> #include <asm/hardware.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/mach-types.h> -#include <asm/hardware/amba.h> #include <asm/mach/arch.h> #include <asm/mach/mmc.h> |
