projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[powerpc.git]
/
arch
/
arm
/
common
/
Kconfig
diff --git
a/arch/arm/common/Kconfig
b/arch/arm/common/Kconfig
index
666ba39
..
5e34ca6
100644
(file)
--- a/
arch/arm/common/Kconfig
+++ b/
arch/arm/common/Kconfig
@@
-1,7
+1,10
@@
-config
ICST525
+config
ARM_GIC
bool
-config ARM_GIC
+config ARM_VIC
+ bool
+
+config ICST525
bool
config ICST307
@@
-23,5
+26,8
@@
config SHARP_LOCOMO
config SHARP_PARAM
bool
+config SHARPSL_PM
+ bool
+
config SHARP_SCOOP
bool