diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-12-27 03:55:45 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-27 03:55:45 -0500 |
commit | c4a4a21977573141fd6d53b9cf0879782ae3dda2 (patch) | |
tree | 79b5170d3b699b0c81d0205e408172ae7e3288e6 | |
parent | 86ed40bd6fe511d26bb8f3fa65a84cb65c235366 (diff) |
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>
-rw-r--r-- | arch/sparc/Kconfig | 4 | ||||
-rw-r--r-- | arch/sparc/mm/srmmu.c | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index cd8c585a6b02..8ec81b684cae 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig | |||
@@ -469,10 +469,6 @@ config SBUSCHAR | |||
469 | bool | 469 | bool |
470 | default y | 470 | default y |
471 | 471 | ||
472 | config SUN_IO | ||
473 | bool | ||
474 | default y | ||
475 | |||
476 | config SUN_LDOMS | 472 | config SUN_LDOMS |
477 | bool "Sun Logical Domains support" | 473 | bool "Sun Logical Domains support" |
478 | depends on SPARC64 | 474 | depends on SPARC64 |
diff --git a/arch/sparc/mm/srmmu.c b/arch/sparc/mm/srmmu.c index 56df59903eaa..fe7ed08390bb 100644 --- a/arch/sparc/mm/srmmu.c +++ b/arch/sparc/mm/srmmu.c | |||
@@ -1312,10 +1312,8 @@ void __init srmmu_paging_init(void) | |||
1312 | #endif | 1312 | #endif |
1313 | poke_srmmu(); | 1313 | poke_srmmu(); |
1314 | 1314 | ||
1315 | #ifdef CONFIG_SUN_IO | ||
1316 | srmmu_allocate_ptable_skeleton(sparc_iomap.start, IOBASE_END); | 1315 | srmmu_allocate_ptable_skeleton(sparc_iomap.start, IOBASE_END); |
1317 | srmmu_allocate_ptable_skeleton(DVMA_VADDR, DVMA_END); | 1316 | srmmu_allocate_ptable_skeleton(DVMA_VADDR, DVMA_END); |
1318 | #endif | ||
1319 | 1317 | ||
1320 | srmmu_allocate_ptable_skeleton( | 1318 | srmmu_allocate_ptable_skeleton( |
1321 | __fix_to_virt(__end_of_fixed_addresses - 1), FIXADDR_TOP); | 1319 | __fix_to_virt(__end_of_fixed_addresses - 1), FIXADDR_TOP); |