From 4ac6493a59c6ed8c96257d35808ba2b70981789d Mon Sep 17 00:00:00 2001 From: Kumar Gala Date: Wed, 27 Jun 2007 00:19:08 -0500 Subject: [PATCH] --- yaml --- r: 60625 b: refs/heads/master c: bf440b712d289b157c72f19b389b8d918a8c8c5c h: refs/heads/master i: 60623: 9d593fd611972a08c80c9ea2c7d274ca229cdfde v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/iseries/pci.c | 2 +- trunk/include/asm-powerpc/pci-bridge.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f85e9ede6a56..5a622fb488c7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5531e41bf41b5bc34e3cb57af89b58a24fc0dd8d +refs/heads/master: bf440b712d289b157c72f19b389b8d918a8c8c5c diff --git a/trunk/arch/powerpc/platforms/iseries/pci.c b/trunk/arch/powerpc/platforms/iseries/pci.c index 23d876211874..da87162000f0 100644 --- a/trunk/arch/powerpc/platforms/iseries/pci.c +++ b/trunk/arch/powerpc/platforms/iseries/pci.c @@ -768,7 +768,7 @@ void __init iSeries_pcibios_init(void) if (phb == NULL) continue; - phb->pci_mem_offset = phb->local_number = bus; + phb->pci_mem_offset = bus; phb->first_busno = bus; phb->last_busno = bus; phb->ops = &iSeries_pci_ops; diff --git a/trunk/include/asm-powerpc/pci-bridge.h b/trunk/include/asm-powerpc/pci-bridge.h index b0325931c324..229ead98ed12 100644 --- a/trunk/include/asm-powerpc/pci-bridge.h +++ b/trunk/include/asm-powerpc/pci-bridge.h @@ -146,7 +146,6 @@ struct pci_controller { struct resource io_resource; struct resource mem_resources[3]; int global_number; - int local_number; unsigned long buid; unsigned long dma_window_base_cur; unsigned long dma_window_size;