summaryrefslogtreecommitdiffstats
path: root/arch/arm/common/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:35:43 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-29 10:35:43 -0700
commit97c169a21bfb5bb2ab2bccd852da4f0d0e021c55 (patch)
tree8e1287cc995a9792e35b2687a7ef870ff15a483d /arch/arm/common/Kconfig
parent9ab7486e446447c8e62f8f46ca85b809e6a9d491 (diff)
parent4cd426f24ff2d95dd9b3aa15fa5fca9736678ad5 (diff)
Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-arm.git
Diffstat (limited to 'arch/arm/common/Kconfig')
-rw-r--r--arch/arm/common/Kconfig3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 692af6b5e8f..666ba393575 100644
--- a/arch/arm/common/Kconfig
+++ b/arch/arm/common/Kconfig
@@ -1,6 +1,9 @@
config ICST525
bool
+config ARM_GIC
+ bool
+
config ICST307
bool