diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-11 16:39:24 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-11 16:39:24 -0700 |
commit | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (patch) | |
tree | c6f31816e5a5afc84e920c6c3f5702327dd990de /arch/sparc/Kconfig | |
parent | f5154a98a1931641f0448f6512294a15279110d7 (diff) | |
parent | b1b510aa284af1908d5d369d52f7dae16aaabd71 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc/Kconfig')
-rw-r--r-- | arch/sparc/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index f7c51b86904..6537445dac0 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig @@ -21,10 +21,6 @@ config GENERIC_ISA_DMA bool default y -config GENERIC_IOMAP - bool - default y - source "init/Kconfig" menu "General machine setup" |