diff --git a/arch/arm/common/Makefile b/arch/arm/common/Makefile
index 2685051b301..ec8d17c9690 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 ea410b6b764..7fc3f0f08b2 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 00000000000..40fe74097be
--- /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