From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 27 Dec 2008 08:55:45 +0000 (-0800)
Subject: sparc: drop SUN_IO
X-Git-Tag: v2.6.29-rc1~568^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c4a4a21977573141fd6d53b9cf0879782ae3dda2;p=linux-2.6-omap-h63xx.git

sparc: drop SUN_IO

SUN_IO is always 'y' so drop it and thus killing an ifdef/endif pair

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index cd8c585a6b0..8ec81b684ca 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -469,10 +469,6 @@ config SBUSCHAR
 	bool
 	default y
 
-config SUN_IO
-	bool
-	default y
-
 config SUN_LDOMS
 	bool "Sun Logical Domains support"
 	depends on SPARC64
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c
index 56df59903ea..fe7ed08390b 100644
--- a/arch/sparc/mm/srmmu.c
+++ b/arch/sparc/mm/srmmu.c
@@ -1312,10 +1312,8 @@ void __init srmmu_paging_init(void)
 #endif
 	poke_srmmu();
 
-#ifdef CONFIG_SUN_IO
 	srmmu_allocate_ptable_skeleton(sparc_iomap.start, IOBASE_END);
 	srmmu_allocate_ptable_skeleton(DVMA_VADDR, DVMA_END);
-#endif
 
 	srmmu_allocate_ptable_skeleton(
 		__fix_to_virt(__end_of_fixed_addresses - 1), FIXADDR_TOP);