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 /drivers | |
| parent | 6351610d6906aacbf9176cbdd045dd3876eec4c0 (diff) | |
| download | blackbird-op-linux-a62c80e559809e6c7851ec04d30575e85ad6f6ed.tar.gz blackbird-op-linux-a62c80e559809e6c7851ec04d30575e85ad6f6ed.zip | |
[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 'drivers')
| -rw-r--r-- | drivers/input/serio/ambakmi.c | 4 | ||||
| -rw-r--r-- | drivers/mmc/mmci.c | 2 | ||||
| -rw-r--r-- | drivers/serial/amba-pl010.c | 4 | ||||
| -rw-r--r-- | drivers/serial/amba-pl011.c | 4 | ||||
| -rw-r--r-- | drivers/video/amba-clcd.c | 5 |
5 files changed, 9 insertions, 10 deletions
diff --git a/drivers/input/serio/ambakmi.c b/drivers/input/serio/ambakmi.c index d847ed51cfb1..cbab5d26377b 100644 --- a/drivers/input/serio/ambakmi.c +++ b/drivers/input/serio/ambakmi.c @@ -19,11 +19,11 @@ #include <linux/delay.h> #include <linux/slab.h> #include <linux/err.h> +#include <linux/amba/bus.h> +#include <linux/amba/kmi.h> #include <asm/io.h> #include <asm/irq.h> -#include <asm/hardware/amba.h> -#include <asm/hardware/amba_kmi.h> #include <asm/hardware/clock.h> #define KMI_BASE (kmi->base) diff --git a/drivers/mmc/mmci.c b/drivers/mmc/mmci.c index 31b0b6d612bf..57375bc12372 100644 --- a/drivers/mmc/mmci.c +++ b/drivers/mmc/mmci.c @@ -19,12 +19,12 @@ #include <linux/highmem.h> #include <linux/mmc/host.h> #include <linux/mmc/protocol.h> +#include <linux/amba/bus.h> #include <asm/div64.h> #include <asm/io.h> #include <asm/scatterlist.h> #include <asm/sizes.h> -#include <asm/hardware/amba.h> #include <asm/hardware/clock.h> #include <asm/mach/mmc.h> diff --git a/drivers/serial/amba-pl010.c b/drivers/serial/amba-pl010.c index ddd0307fece2..48f6e872314b 100644 --- a/drivers/serial/amba-pl010.c +++ b/drivers/serial/amba-pl010.c @@ -47,12 +47,12 @@ #include <linux/tty_flip.h> #include <linux/serial_core.h> #include <linux/serial.h> +#include <linux/amba/bus.h> +#include <linux/amba/serial.h> #include <asm/io.h> #include <asm/irq.h> #include <asm/hardware.h> -#include <asm/hardware/amba.h> -#include <asm/hardware/amba_serial.h> #define UART_NR 2 diff --git a/drivers/serial/amba-pl011.c b/drivers/serial/amba-pl011.c index 531b0e4f25e5..4ae4dff59795 100644 --- a/drivers/serial/amba-pl011.c +++ b/drivers/serial/amba-pl011.c @@ -47,12 +47,12 @@ #include <linux/tty_flip.h> #include <linux/serial_core.h> #include <linux/serial.h> +#include <linux/amba/bus.h> +#include <linux/amba/serial.h> #include <asm/io.h> #include <asm/sizes.h> -#include <asm/hardware/amba.h> #include <asm/hardware/clock.h> -#include <asm/hardware/amba_serial.h> #define UART_NR 14 diff --git a/drivers/video/amba-clcd.c b/drivers/video/amba-clcd.c index 69421c86252c..3358a1429651 100644 --- a/drivers/video/amba-clcd.c +++ b/drivers/video/amba-clcd.c @@ -21,13 +21,12 @@ #include <linux/init.h> #include <linux/ioport.h> #include <linux/list.h> +#include <linux/amba/bus.h> +#include <linux/amba/clcd.h> #include <asm/sizes.h> -#include <asm/hardware/amba.h> #include <asm/hardware/clock.h> -#include <asm/hardware/amba_clcd.h> - #define to_clcd(info) container_of(info, struct clcd_fb, fb) /* This is limited to 16 characters when displayed by X startup */ |
