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 tag 'nfs-for-4.6-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-mv78xx0
/
Kconfig
diff --git
a/arch/arm/mach-mv78xx0/Kconfig
b/arch/arm/mach-mv78xx0/Kconfig
index a32575fa3fba4d727e4584e7c169a5de09f46c48..c32f85559c6509e7f64116c351730141db16938a 100644
(file)
--- a/
arch/arm/mach-mv78xx0/Kconfig
+++ b/
arch/arm/mach-mv78xx0/Kconfig
@@
-1,5
+1,6
@@
menuconfig ARCH_MV78XX0
- bool "Marvell MV78xx0" if ARCH_MULTI_V5
+ bool "Marvell MV78xx0"
+ depends on ARCH_MULTI_V5
select ARCH_REQUIRE_GPIOLIB
select CPU_FEROCEON
select MVEBU_MBUS