diff options
Diffstat (limited to 'arch/sparc')
| -rw-r--r-- | arch/sparc/kernel/ebus.c | 7 | ||||
| -rw-r--r-- | arch/sparc/kernel/ioport.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/sparc/kernel/ebus.c b/arch/sparc/kernel/ebus.c index 81c0cbd96f..75ac24d229 100644 --- a/arch/sparc/kernel/ebus.c +++ b/arch/sparc/kernel/ebus.c | |||
| @@ -277,7 +277,7 @@ void __init ebus_init(void) | |||
| 277 | struct pci_dev *pdev; | 277 | struct pci_dev *pdev; |
| 278 | struct pcidev_cookie *cookie; | 278 | struct pcidev_cookie *cookie; |
| 279 | struct device_node *dp; | 279 | struct device_node *dp; |
| 280 | unsigned long addr, *base; | 280 | struct resource *p; |
| 281 | unsigned short pci_command; | 281 | unsigned short pci_command; |
| 282 | int len, reg, nreg; | 282 | int len, reg, nreg; |
| 283 | int num_ebus = 0; | 283 | int num_ebus = 0; |
| @@ -321,13 +321,12 @@ void __init ebus_init(void) | |||
| 321 | } | 321 | } |
| 322 | nreg = len / sizeof(struct linux_prom_pci_registers); | 322 | nreg = len / sizeof(struct linux_prom_pci_registers); |
| 323 | 323 | ||
| 324 | base = &ebus->self->resource[0].start; | 324 | p = &ebus->self->resource[0]; |
| 325 | for (reg = 0; reg < nreg; reg++) { | 325 | for (reg = 0; reg < nreg; reg++) { |
| 326 | if (!(regs[reg].which_io & 0x03000000)) | 326 | if (!(regs[reg].which_io & 0x03000000)) |
| 327 | continue; | 327 | continue; |
| 328 | 328 | ||
| 329 | addr = regs[reg].phys_lo; | 329 | (p++)->start = regs[reg].phys_lo; |
| 330 | *base++ = addr; | ||
| 331 | } | 330 | } |
| 332 | 331 | ||
| 333 | ebus->ofdev.node = dp; | 332 | ebus->ofdev.node = dp; |
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 8654b446ac..d33f8a07cc 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) |