Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 376534
b: refs/heads/master
c: 858957a
h: refs/heads/master
v: v3
  • Loading branch information
Kevin Hao authored and Benjamin Herrenschmidt committed May 31, 2013
1 parent 37b3131 commit 218173d
Show file tree
Hide file tree
Showing 2 changed files with 2 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: 279838960484fa22d903086eea743a6b6700647d
refs/heads/master: 858957ab1e3a7ee29ed40309bdf0f1b7bcf5bf30
5 changes: 1 addition & 4 deletions trunk/arch/powerpc/kernel/pci-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -671,10 +671,9 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
int rlen;
int pna = of_n_addr_cells(dev);
int np = pna + 5;
int memno = 0, isa_hole = -1;
int memno = 0;
u32 pci_space;
unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size;
unsigned long long isa_mb = 0;
struct resource *res;

printk(KERN_INFO "PCI host bridge %s %s ranges:\n",
Expand Down Expand Up @@ -768,8 +767,6 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
}
/* Handles ISA memory hole space here */
if (pci_addr == 0) {
isa_mb = cpu_addr;
isa_hole = memno;
if (primary || isa_mem_base == 0)
isa_mem_base = cpu_addr;
hose->isa_mem_phys = cpu_addr;
Expand Down

0 comments on commit 218173d

Please sign in to comment.