summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrant Grundler <grundler@parisc-linux.org>2006-01-19 23:38:03 -0700
committerKyle McMartin <kyle@duet.int.mcmartin.ca>2006-01-22 20:26:34 -0500
commit2c9aadabf454fb07b8f7533096e22bf005dd08df (patch)
treefdc041a98022f348808aab1084b3ef2a39c71ee8
parentcb6fc18e9ca615f03d18e60c49855b434ca2e51e (diff)
downloadlinux-stable-2c9aadabf454fb07b8f7533096e22bf005dd08df.tar.gz
linux-stable-2c9aadabf454fb07b8f7533096e22bf005dd08df.tar.bz2
linux-stable-2c9aadabf454fb07b8f7533096e22bf005dd08df.zip
[PARISC] Remove unnecessary extern declarations from asm/pci.h
Remove two unnecessary extern declarations from asm/pci.h. They collide with what gcc4.0 assumed was static (and should be static). Found by Joel Soete. Signed-off-by: Grant Grundler <grundler@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
-rw-r--r--arch/parisc/kernel/pci.c2
-rw-r--r--include/asm-parisc/pci.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c
index 3a7dda860336..d66d7cb1c0d9 100644
--- a/arch/parisc/kernel/pci.c
+++ b/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/include/asm-parisc/pci.h b/include/asm-parisc/pci.h
index 4c5e15ea3a02..fe7f6a2f5aa7 100644
--- a/include/asm-parisc/pci.h
+++ b/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 *);