diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 15:16:15 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-18 15:16:15 -0500 |
| commit | 35267ab61f0bf7a867ac87e19714b858d08d440a (patch) | |
| tree | db84140a40b22208fe2a598fa233c26e79eb6465 /arch/ppc/kernel/pci.c | |
| parent | a9931a6e37c09f6b76a9fa0cbd777c335548692b (diff) | |
| parent | 8907e94be2661be940c622232d6ce5ae938f10c3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/ppc/kernel/pci.c')
| -rw-r--r-- | arch/ppc/kernel/pci.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c index 48ed58f995c0..f7fae5f153b2 100644 --- a/arch/ppc/kernel/pci.c +++ b/arch/ppc/kernel/pci.c @@ -45,7 +45,6 @@ static void update_bridge_base(struct pci_bus *bus, int i); static void pcibios_fixup_resources(struct pci_dev* dev); static void fixup_broken_pcnet32(struct pci_dev* dev); static int reparent_resources(struct resource *parent, struct resource *res); -static void fixup_rev1_53c810(struct pci_dev* dev); static void fixup_cpc710_pci64(struct pci_dev* dev); #ifdef CONFIG_PPC_OF static u8* pci_to_OF_bus_map; |