From ad896bb65f17f92860ed1e37b40cc158fdb19e93 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 19 Nov 2007 16:56:15 +1100 Subject: [PATCH] --- yaml --- r: 80977 b: refs/heads/master c: ebfc00f78c13d0643c858ccc61c5bb8be0a5dbf0 h: refs/heads/master i: 80975: c86e5e427ca40dd13586c1f5e7fa1f084cd5f576 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci-common.c | 2 +- trunk/include/asm-powerpc/ppc-pci.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a242cfeaf353..9a174a79bf4f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a8a1a28bb35a62561367c0a1144dbc5dcb95230 +refs/heads/master: ebfc00f78c13d0643c858ccc61c5bb8be0a5dbf0 diff --git a/trunk/arch/powerpc/kernel/pci-common.c b/trunk/arch/powerpc/kernel/pci-common.c index 2ae3b6f778a3..742ff7295de6 100644 --- a/trunk/arch/powerpc/kernel/pci-common.c +++ b/trunk/arch/powerpc/kernel/pci-common.c @@ -48,7 +48,7 @@ static DEFINE_SPINLOCK(hose_spinlock); /* XXX kill that some day ... */ -int global_phb_number; /* Global phb counter */ +static int global_phb_number; /* Global phb counter */ extern struct list_head hose_list; diff --git a/trunk/include/asm-powerpc/ppc-pci.h b/trunk/include/asm-powerpc/ppc-pci.h index b847aa10074b..fda5e3d1f62a 100644 --- a/trunk/include/asm-powerpc/ppc-pci.h +++ b/trunk/include/asm-powerpc/ppc-pci.h @@ -22,7 +22,6 @@ extern void pci_setup_phb_io_dynamic(struct pci_controller *hose, int primary); extern struct list_head hose_list; -extern int global_phb_number; extern void find_and_init_phbs(void);