---

yaml --- r: 297516 b: refs/heads/master c: 08714f6 h: refs/heads/master v: v3
git-mirror · Mar 13, 2012 · de919e8 · de919e8
1 parent ae2579e
commit de919e8
Show file tree

Hide file tree

Showing 13 changed files with 2,256 additions and 2,380 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5170c051a56244816d948c43592c1b2805ed4f3a
+refs/heads/master: 08714f60b0fc6ea3a060b69b32e77139f14e6045
diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig
@@ -24,6 +24,9 @@ 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,6 +5,7 @@
 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