diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-23 08:34:10 -0400 |
| commit | 919251758195919ae3568021bc221e4f8c4b20eb (patch) | |
| tree | 81137a037ff8e6c91cc8de72d568275605c653c5 /arch/sparc/kernel/ioport.c | |
| parent | c394f1eafef61c6666f5876afde6110a276c4c9f (diff) | |
| parent | 3eeab61aa3ddd3c0bedb7449ada1599de22fdb5a (diff) | |
Merge branch 'mainline' into upstream-linus
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 2 |
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 | ||
| 509 | void __init sbus_setup_iommu(struct sbus_bus *sbus, struct device_node *dp) | 509 | void __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 | ||
| 529 | void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp) | 531 | void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp) |