diff --git a/[refs] b/[refs]
index 4d7c2cf05f70..ce9f34b5a68c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cb6fc18e9ca615f03d18e60c49855b434ca2e51e
+refs/heads/master: 2c9aadabf454fb07b8f7533096e22bf005dd08df
diff --git a/trunk/arch/parisc/kernel/pci.c b/trunk/arch/parisc/kernel/pci.c
index 3a7dda860336..d66d7cb1c0d9 100644
--- a/trunk/arch/parisc/kernel/pci.c
+++ b/trunk/arch/parisc/kernel/pci.c
@@ -57,7 +57,7 @@ static int pci_hba_count __read_mostly;
 
 /* parisc_pci_hba used by pci_port->in/out() ops to lookup bus data.  */
 #define PCI_HBA_MAX 32
-struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX] __read_mostly;
+static struct pci_hba_data *parisc_pci_hba[PCI_HBA_MAX] __read_mostly;
 
 
 /********************************************************************
diff --git a/trunk/include/asm-parisc/pci.h b/trunk/include/asm-parisc/pci.h
index 4c5e15ea3a02..fe7f6a2f5aa7 100644
--- a/trunk/include/asm-parisc/pci.h
+++ b/trunk/include/asm-parisc/pci.h
@@ -203,8 +203,6 @@ struct pci_bios_ops {
 */
 extern struct pci_port_ops *pci_port;
 extern struct pci_bios_ops *pci_bios;
-extern int pci_hba_count;
-extern struct pci_hba_data *parisc_pci_hba[];
 
 #ifdef CONFIG_PCI
 extern void pcibios_register_hba(struct pci_hba_data *);