From 007cd0dfde2289a1d0f8b618bf3ae984cec05ae1 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 10 Oct 2005 21:02:26 -0700 Subject: [PATCH] --- yaml --- r: 9813 b: refs/heads/master c: 08eb8f124f990aa476589d1f7810f7ec7f259c08 h: refs/heads/master i: 9811: a07f0bf0608aeda53f489cf51fc7a58843361133 v: v3 --- [refs] | 2 +- trunk/arch/sparc/Kconfig | 4 ---- trunk/arch/sparc/defconfig | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 0d25c160ca21..24dd82cc8a13 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8df110fea555d5088bba67f446c2435104405be +refs/heads/master: 08eb8f124f990aa476589d1f7810f7ec7f259c08 diff --git a/trunk/arch/sparc/Kconfig b/trunk/arch/sparc/Kconfig index f7c51b869049..6537445dac0e 100644 --- a/trunk/arch/sparc/Kconfig +++ b/trunk/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/trunk/arch/sparc/defconfig b/trunk/arch/sparc/defconfig index 8a3aef1e22f5..a69856263009 100644 --- a/trunk/arch/sparc/defconfig +++ b/trunk/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