---

yaml --- r: 297527 b: refs/heads/master c: 1f3d6dc h: refs/heads/master i: 297525: a0b278e 297523: 3ef3a66 297519: 9efe5ea v: v3
git-mirror · Mar 13, 2012 · 70283e8 · 70283e8
1 parent 434845a
commit 70283e8
Show file tree

Hide file tree

Showing 11 changed files with 2,372 additions and 2,255 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 949ff5b8d46b5e3435d21b2651ce3a2599208d44
+refs/heads/master: 1f3d6dc0be92f0caca937926cca16ec4fdd585a3
diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig
@@ -24,9 +24,6 @@ config ARM_VIC_NR
 config ICST
 	bool
 
-config PL330
-	bool
-
 config SA1111
 	bool
 	select DMABOUNCE if !ARCH_PXA

diff --git a/trunk/arch/arm/common/Makefile b/trunk/arch/arm/common/Makefile
@@ -5,7 +5,6 @@
 obj-$(CONFIG_ARM_GIC)		+= gic.o
 obj-$(CONFIG_ARM_VIC)		+= vic.o
 obj-$(CONFIG_ICST)		+= icst.o
-obj-$(CONFIG_PL330)		+= pl330.o
 obj-$(CONFIG_SA1111)		+= sa1111.o
 obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
 obj-$(CONFIG_DMABOUNCE)		+= dmabounce.o