summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2006-01-07 14:54:15 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2006-01-07 14:54:15 +0000
commitde1d815fccee1f4766a7e56054ab0ec3f6f3a7db (patch)
treee767e18755de6efc55f8ea2759ece2aa74574b05
parent123656d4cc8c946f578ebd18c2050f5251720428 (diff)
downloadlinux-de1d815fccee1f4766a7e56054ab0ec3f6f3a7db.tar.gz
linux-de1d815fccee1f4766a7e56054ab0ec3f6f3a7db.tar.bz2
linux-de1d815fccee1f4766a7e56054ab0ec3f6f3a7db.zip
[ARM] Move AMBA bus code to drivers/amba/
Make the AMBA bus code visible to other architectures. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/common/Makefile1
-rw-r--r--drivers/Makefile1
-rw-r--r--drivers/amba/Makefile2
-rw-r--r--drivers/amba/bus.c (renamed from arch/arm/common/amba.c)0
4 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 2685051b3013..ec8d17c96906 100644
--- a/arch/arm/common/Makefile
+++ b/arch/arm/common/Makefile
@@ -3,7 +3,6 @@
#
obj-y += rtctime.o
-obj-$(CONFIG_ARM_AMBA) += amba.o
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ICST525) += icst525.o
obj-$(CONFIG_ICST307) += icst307.o
diff --git a/drivers/Makefile b/drivers/Makefile
index ea410b6b7644..7fc3f0f08b29 100644
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -13,6 +13,7 @@ obj-$(CONFIG_ACPI) += acpi/
# PnP must come after ACPI since it will eventually need to check if acpi
# was used and do nothing if so
obj-$(CONFIG_PNP) += pnp/
+obj-$(CONFIG_ARM_AMBA) += amba/
# char/ comes before serial/ etc so that the VT console is the boot-time
# default.
diff --git a/drivers/amba/Makefile b/drivers/amba/Makefile
new file mode 100644
index 000000000000..40fe74097be2
--- /dev/null
+++ b/drivers/amba/Makefile
@@ -0,0 +1,2 @@
+obj-y += bus.o
+
diff --git a/arch/arm/common/amba.c b/drivers/amba/bus.c
index 1bbdd1693d57..1bbdd1693d57 100644
--- a/arch/arm/common/amba.c
+++ b/drivers/amba/bus.c