aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2005-10-10 21:02:26 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2005-10-10 21:02:26 -0700
commit08eb8f124f990aa476589d1f7810f7ec7f259c08 (patch)
tree2c303b6c0bc4a2c41ed493af7713e3088ba0482c
parentb8df110fea555d5088bba67f446c2435104405be (diff)
[SPARC32]: Revert IOMAP change eb98129eec7fa605f0407dfd92d40ee8ddf5cd9a
Breakage noted by Al Viro. It breaks non-PCI builds, it's probably better to have a more direct implementation on sparc32, and which driver actually needs this is still questionable. We can resolve this in 2.6.15 Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--arch/sparc/Kconfig4
-rw-r--r--arch/sparc/defconfig1
2 files changed, 0 insertions, 5 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"
diff --git a/arch/sparc/defconfig b/arch/sparc/defconfig
index 8a3aef1e22f..a6985626300 100644
--- a/arch/sparc/defconfig
+++ b/arch/sparc/defconfig
@@ -5,7 +5,6 @@ CONFIG_MMU=y
CONFIG_UID16=y
CONFIG_HIGHMEM=y
CONFIG_GENERIC_ISA_DMA=y
-CONFIG_GENERIC_IOMAP=y
#
# Code maturity level options