diff options
| author | Greg Kroah-Hartman <greg@kroah.com> | 2005-01-09 16:52:36 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <greg@kroah.com> | 2005-01-09 16:52:36 -0800 |
| commit | e57e50f6a5f4d10c8485bd2affe6c3385dabe2fe (patch) | |
| tree | a24cc4d0ed37044b8237e6b162108ff69bd12d32 /arch | |
| parent | 11d7829025bddd70d592061728e62e0419de0349 (diff) | |
| parent | 9fa0bfe4100de3d4edb293f9a464ae711ff8c9e2 (diff) | |
| download | history-e57e50f6a5f4d10c8485bd2affe6c3385dabe2fe.tar.gz | |
Merge kroah.com:/home/greg/linux/BK/bleed-2.6
into kroah.com:/home/greg/linux/BK/pci-2.6
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/i386/pci/fixup.c | 4 | ||||
| -rw-r--r-- | arch/i386/pci/irq.c | 4 | ||||
| -rw-r--r-- | arch/i386/pci/pci.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c index f5a345118b7670..27cf192061c2e2 100644 --- a/arch/i386/pci/fixup.c +++ b/arch/i386/pci/fixup.c @@ -282,7 +282,7 @@ static int quirk_pcie_aspm_write(struct pci_bus *bus, unsigned int devfn, int wh return raw_pci_ops->write(0, bus->number, devfn, where, size, value); } -struct pci_ops quirk_pcie_aspm_ops = { +static struct pci_ops quirk_pcie_aspm_ops = { .read = quirk_pcie_aspm_read, .write = quirk_pcie_aspm_write, }; @@ -295,7 +295,7 @@ struct pci_ops quirk_pcie_aspm_ops = { * the root port in an array for fast indexing. Replace the bus ops * with the modified one. */ -void pcie_rootport_aspm_quirk(struct pci_dev *pdev) +static void pcie_rootport_aspm_quirk(struct pci_dev *pdev) { int cap_base, i; struct pci_bus *pbus; diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c index 7975a0c6be37e3..252f750115fd32 100644 --- a/arch/i386/pci/irq.c +++ b/arch/i386/pci/irq.c @@ -29,6 +29,8 @@ static int acer_tm360_irqrouting; static struct irq_routing_table *pirq_table; +static int pirq_enable_irq(struct pci_dev *dev); + /* * Never use: 0, 1, 2 (timer, keyboard, and cascade) * Avoid using: 13, 14 and 15 (FP error and IDE). @@ -1021,7 +1023,7 @@ void pcibios_penalize_isa_irq(int irq) pirq_penalize_isa_irq(irq); } -int pirq_enable_irq(struct pci_dev *dev) +static int pirq_enable_irq(struct pci_dev *dev) { u8 pin; extern int via_interrupt_line_quirk; diff --git a/arch/i386/pci/pci.h b/arch/i386/pci/pci.h index 13684e1cc479fd..a8fc80ca69f309 100644 --- a/arch/i386/pci/pci.h +++ b/arch/i386/pci/pci.h @@ -71,6 +71,4 @@ extern unsigned int pcibios_irq_mask; extern int pcibios_scanned; extern spinlock_t pci_config_lock; -int pirq_enable_irq(struct pci_dev *dev); - extern int (*pcibios_enable_irq)(struct pci_dev *dev); |