projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
[cascardo/linux.git]
/
arch
/
arm
/
mach-sti
/
Kconfig
diff --git
a/arch/arm/mach-sti/Kconfig
b/arch/arm/mach-sti/Kconfig
index
12dd1dc
..
a196d14
100644
(file)
--- a/
arch/arm/mach-sti/Kconfig
+++ b/
arch/arm/mach-sti/Kconfig
@@
-1,5
+1,6
@@
menuconfig ARCH_STI
- bool "STMicroelectronics Consumer Electronics SOCs" if ARCH_MULTI_V7
+ bool "STMicroelectronics Consumer Electronics SOCs"
+ depends on ARCH_MULTI_V7
select ARM_GIC
select ST_IRQCHIP
select ARM_GLOBAL_TIMER