Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 34347
b: refs/heads/master
c: cc9bd99
h: refs/heads/master
i:
  34345: 8ec42b5
  34343: 24524c0
v: v3
  • Loading branch information
Al Viro authored and Linus Torvalds committed Sep 23, 2006
1 parent 388e3c1 commit 5904b13
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a83fbf635992442edf6aa3252e4008d4a08edf12
refs/heads/master: cc9bd99e9adfa4f44ea050a63fb41a3f764acf84
7 changes: 3 additions & 4 deletions trunk/arch/sparc/kernel/ebus.c
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ void __init ebus_init(void)
struct pci_dev *pdev;
struct pcidev_cookie *cookie;
struct device_node *dp;
unsigned long addr, *base;
struct resource *p;
unsigned short pci_command;
int len, reg, nreg;
int num_ebus = 0;
Expand Down Expand Up @@ -321,13 +321,12 @@ void __init ebus_init(void)
}
nreg = len / sizeof(struct linux_prom_pci_registers);

base = &ebus->self->resource[0].start;
p = &ebus->self->resource[0];
for (reg = 0; reg < nreg; reg++) {
if (!(regs[reg].which_io & 0x03000000))
continue;

addr = regs[reg].phys_lo;
*base++ = addr;
(p++)->start = regs[reg].phys_lo;
}

ebus->ofdev.node = dp;
Expand Down

0 comments on commit 5904b13

Please sign in to comment.