aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-09-22 20:26:02 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-22 20:48:57 -0400
commit5932ef077716e3e798eaba6738ef874849f62a17 (patch)
treeaef525063c75811002dc97033cfa6a9933e026ff /arch
parenta07562e03a3f4a1276931e3fb3cb532622a6c616 (diff)
[PATCH] sun4: fix sbus_setup_iommu()
iommu_init() and iounit_init() are never called for sun4, but that's not enough - these calls should be ifdefed out since the functions in question simply do not exist for CONFIG_SUN4 kernel. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/ioport.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c
index 8654b446ac9e..d33f8a07ccac 100644
--- a/arch/sparc/kernel/ioport.c
+++ b/arch/sparc/kernel/ioport.c
@@ -508,6 +508,7 @@ void __init sbus_arch_bus_ranges_init(struct device_node *pn, struct sbus_bus *s
508 508
509void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) 509void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
510{ 510{
511#ifndef CONFIG_SUN4
511 struct device_node *parent = dp->parent; 512 struct device_node *parent = dp->parent;
512 513
513 if (sparc_cpu_model != sun4d && 514 if (sparc_cpu_model != sun4d &&
@@ -524,6 +525,7 @@ void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp)
524 525
525 iounit_init(dp->node, parent->node, sbus); 526 iounit_init(dp->node, parent->node, sbus);
526 } 527 }
528#endif
527} 529}
528 530
529void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp) 531void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp)