From f065a28b2765fd4c2dc2804a3d9258507a04d14c Mon Sep 17 00:00:00 2001 From: Russell King Date: Sat, 7 Jan 2006 14:54:15 +0000 Subject: [PATCH] --- yaml --- r: 16771 b: refs/heads/master c: de1d815fccee1f4766a7e56054ab0ec3f6f3a7db h: refs/heads/master i: 16769: 2970debf24008aeb5e8645e752684c9e5ed4852b 16767: cbc6674aadbd3e7458b5977b527d7a01bb8224a9 v: v3 --- [refs] | 2 +- trunk/arch/arm/common/Makefile | 1 - trunk/drivers/Makefile | 1 + trunk/drivers/amba/Makefile | 2 ++ trunk/{arch/arm/common/amba.c => drivers/amba/bus.c} | 0 5 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 trunk/drivers/amba/Makefile rename trunk/{arch/arm/common/amba.c => drivers/amba/bus.c} (100%) diff --git a/[refs] b/[refs] index 0df457d63cce..35d4bbefd5c1 100644 --- 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 index 2685051b3013..ec8d17c96906 100644 --- 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 index ea410b6b7644..7fc3f0f08b29 100644 --- 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 new file mode 100644 index 000000000000..40fe74097be2 --- /dev/null +++ b/trunk/drivers/amba/Makefile @@ -0,0 +1,2 @@ +obj-y += bus.o + diff --git a/trunk/arch/arm/common/amba.c b/trunk/drivers/amba/bus.c similarity index 100% rename from trunk/arch/arm/common/amba.c rename to trunk/drivers/amba/bus.c