diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 2685051b30131666c703f5bd607eb9878ab6fefc..ec8d17c96906aac4819918799ed9296be6008c05 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 ea410b6b7644fa4b7959e324ba5595019b90bfe6..7fc3f0f08b29e76aa8db89f82e6e62378391d61d 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 0000000000000000000000000000000000000000..40fe74097be23e827b22d64b2b795204fa3cf540
--- /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
similarity index 100%
rename from arch/arm/common/amba.c
rename to drivers/amba/bus.c