git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
common
/
Kconfig
diff --git
a/arch/arm/common/Kconfig
b/arch/arm/common/Kconfig
index 283fa1d804f4d34208e544f5c3064a72457afc52..45ceeb0e93e05faaa40195a30d82045f7b6aabe0 100644
(file)
--- a/
arch/arm/common/Kconfig
+++ b/
arch/arm/common/Kconfig
@@
-1,15
+1,15
@@
config ARM_GIC
+ bool
select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
- bool
config GIC_NON_BANKED
bool
config ARM_VIC
+ bool
select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
- bool
config ARM_VIC_NR
int