aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-10-08 14:57:20 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-10-08 14:57:20 -0700
commit582fd487611baa06b07665978429192390c29b8f (patch)
tree05625e483cc3ebf0de1a2df8dfd57bbb5a208c28 /arch/sparc/Kconfig
parent7ab501db8cb6659efdf04034e0de6b44c059a51b (diff)
parentba6399334dd8a75bd295de26496196c720abae0a (diff)
downloadlinux-stericsson-582fd487611baa06b07665978429192390c29b8f.tar.gz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r--arch/sparc/Kconfig4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 6537445dac0e..f7c51b869049 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -21,6 +21,10 @@ config GENERIC_ISA_DMA
bool
default y
+config GENERIC_IOMAP
+ bool
+ default y
+
source "init/Kconfig"
menu "General machine setup"