summaryrefslogtreecommitdiff
path: root/arch/openrisc/Kconfig
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-05-08 03:27:46 +0400
committerRalf Baechle <ralf@linux-mips.org>2013-05-08 03:27:46 +0400
commit9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7 (patch)
tree5c56e4a208dbe7e985e59911e1a421a7c1ee024c /arch/openrisc/Kconfig
parent3d39019a1655d195a60a86ebf38f9da30bd83d03 (diff)
parent1cd1c049271233deccfcc75123afa7f39a607f5a (diff)
downloadlinux-9b3539e0e545e4c2f338acfc1ce52033a6f5e7f7.tar.xz
Merge branch 'mips-next-3.10' of git://git.linux-mips.org/pub/scm/john/linux-john into mips-for-linux-next
Diffstat (limited to 'arch/openrisc/Kconfig')
-rw-r--r--arch/openrisc/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index 014a6482ed4c..9ab3bf2eca8d 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -9,10 +9,9 @@ config OPENRISC
select OF_EARLY_FLATTREE
select IRQ_DOMAIN
select HAVE_MEMBLOCK
- select ARCH_WANT_OPTIONAL_GPIOLIB
+ select ARCH_REQUIRE_GPIOLIB
select HAVE_ARCH_TRACEHOOK
select HAVE_GENERIC_HARDIRQS
- select HAVE_VIRT_TO_BUS
select GENERIC_IRQ_CHIP
select GENERIC_IRQ_PROBE
select GENERIC_IRQ_SHOW