---

yaml --- r: 16771 b: refs/heads/master c: de1d815 h: refs/heads/master i: 16769: 2970deb 16767: cbc6674 v: v3
git-mirror · Jan 7, 2006 · f065a28 · f065a28
1 parent d39afa3
commit f065a28
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 123656d4cc8c946f578ebd18c2050f5251720428
+refs/heads/master: de1d815fccee1f4766a7e56054ab0ec3f6f3a7db
diff --git a/trunk/arch/arm/common/Makefile b/trunk/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/trunk/drivers/Makefile b/trunk/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/trunk/drivers/amba/Makefile b/trunk/drivers/amba/Makefile
@@ -0,0 +1,2 @@
+obj-y		+= bus.o
+
diff --git a/trunk/arch/arm/common/amba.c → trunk/drivers/amba/bus.c b/trunk/arch/arm/common/amba.c → trunk/drivers/amba/bus.c