summaryrefslogtreecommitdiff
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-11-02 16:52:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-11-02 16:52:17 -0700
commitf7e801172c53c4dc48b1f888a72eae069be6333a (patch)
tree61d5243a48fe3640dbace0222054fc88dd0c6612 /arch/ia64/Kconfig
parent092f4c56c1927e4b61a41ee8055005f1cb437009 (diff)
parent6b1c70b1ff6f800f081a6bbef662789135f7b398 (diff)
Merge branch 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
* 'misc-3.2' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux: MAINTAINERS: Update entry for IA64 [IA64] gpio: GENERIC_GPIO default must be n [IA64[ add CONFIG_NET_VENDOR_INTEL=y to default config files where needed [IA64] agp/hp-agp: Allow binding user memory to the AGP GART [IA64] sn2: add missing put_cpu()
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3ff7785b3beb..27489b6dd533 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -92,7 +92,7 @@ config HAVE_SETUP_PER_CPU_AREA
def_bool y
config GENERIC_GPIO
- def_bool y
+ bool
config DMI
bool