---

yaml --- r: 297512 b: refs/heads/master c: b7d861d h: refs/heads/master v: v3
git-mirror · Mar 8, 2012 · aa4a439 · aa4a439
1 parent 8640cd0
commit aa4a439
Show file tree

Hide file tree

Showing 8 changed files with 2,114 additions and 2,184 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6d0d7e2d554a2d1a39ee9397c3136df7a53ff348
+refs/heads/master: b7d861d9394534db94f0fb8f4b9d984f996d0528
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