diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 08:52:45 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 08:52:45 -0500 |
commit | a62c80e559809e6c7851ec04d30575e85ad6f6ed (patch) | |
tree | 7d91fd1f5186ad0d95498f65acfa5a10942133d6 /include | |
parent | 6351610d6906aacbf9176cbdd045dd3876eec4c0 (diff) |
[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 'include')
-rw-r--r-- | include/asm-arm/arch-integrator/debug-macro.S | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-realview/debug-macro.S | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-versatile/debug-macro.S | 2 | ||||
-rw-r--r-- | include/linux/amba/bus.h (renamed from include/asm-arm/hardware/amba.h) | 0 | ||||
-rw-r--r-- | include/linux/amba/clcd.h (renamed from include/asm-arm/hardware/amba_clcd.h) | 0 | ||||
-rw-r--r-- | include/linux/amba/kmi.h (renamed from include/asm-arm/hardware/amba_kmi.h) | 0 | ||||
-rw-r--r-- | include/linux/amba/serial.h (renamed from include/asm-arm/hardware/amba_serial.h) | 0 |
7 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-arm/arch-integrator/debug-macro.S b/include/asm-arm/arch-integrator/debug-macro.S index 484a1aa47098..031d30941791 100644 --- a/include/asm-arm/arch-integrator/debug-macro.S +++ b/include/asm-arm/arch-integrator/debug-macro.S | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <asm/hardware/amba_serial.h> | 14 | #include <linux/amba/serial.h> |
15 | 15 | ||
16 | .macro addruart,rx | 16 | .macro addruart,rx |
17 | mrc p15, 0, \rx, c1, c0 | 17 | mrc p15, 0, \rx, c1, c0 |
diff --git a/include/asm-arm/arch-realview/debug-macro.S b/include/asm-arm/arch-realview/debug-macro.S index ed28bd012236..017ad996848d 100644 --- a/include/asm-arm/arch-realview/debug-macro.S +++ b/include/asm-arm/arch-realview/debug-macro.S | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <asm/hardware/amba_serial.h> | 14 | #include <linux/amba/serial.h> |
15 | 15 | ||
16 | .macro addruart,rx | 16 | .macro addruart,rx |
17 | mrc p15, 0, \rx, c1, c0 | 17 | mrc p15, 0, \rx, c1, c0 |
diff --git a/include/asm-arm/arch-versatile/debug-macro.S b/include/asm-arm/arch-versatile/debug-macro.S index 89e38ac1444e..ef6167116dbb 100644 --- a/include/asm-arm/arch-versatile/debug-macro.S +++ b/include/asm-arm/arch-versatile/debug-macro.S | |||
@@ -11,7 +11,7 @@ | |||
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <asm/hardware/amba_serial.h> | 14 | #include <linux/amba/serial.h> |
15 | 15 | ||
16 | .macro addruart,rx | 16 | .macro addruart,rx |
17 | mrc p15, 0, \rx, c1, c0 | 17 | mrc p15, 0, \rx, c1, c0 |
diff --git a/include/asm-arm/hardware/amba.h b/include/linux/amba/bus.h index 51e6e54b2aa1..51e6e54b2aa1 100644 --- a/include/asm-arm/hardware/amba.h +++ b/include/linux/amba/bus.h | |||
diff --git a/include/asm-arm/hardware/amba_clcd.h b/include/linux/amba/clcd.h index 6b8d73dc1ab0..6b8d73dc1ab0 100644 --- a/include/asm-arm/hardware/amba_clcd.h +++ b/include/linux/amba/clcd.h | |||
diff --git a/include/asm-arm/hardware/amba_kmi.h b/include/linux/amba/kmi.h index a39e5be751b3..a39e5be751b3 100644 --- a/include/asm-arm/hardware/amba_kmi.h +++ b/include/linux/amba/kmi.h | |||
diff --git a/include/asm-arm/hardware/amba_serial.h b/include/linux/amba/serial.h index dc726ffccebd..dc726ffccebd 100644 --- a/include/asm-arm/hardware/amba_serial.h +++ b/include/linux/amba/serial.h | |||