diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-18 13:23:21 -0500 |
| commit | 638cbac8de9b57345a9446e107b6aebc10b58970 (patch) | |
| tree | e445fe3a1b8ad718d7ee770ed1c7a43e3eb5a611 /arch/ppc/kernel/pci.c | |
| parent | f055408957750cf759162c364c2a4dfe19765844 (diff) | |
| parent | fc71fe40d2bedcc57d3406bf2050481f8b3441b6 (diff) | |
Merge branch 'master'
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); | |||
| 45 | static void pcibios_fixup_resources(struct pci_dev* dev); | 45 | static void pcibios_fixup_resources(struct pci_dev* dev); |
| 46 | static void fixup_broken_pcnet32(struct pci_dev* dev); | 46 | static void fixup_broken_pcnet32(struct pci_dev* dev); |
| 47 | static int reparent_resources(struct resource *parent, struct resource *res); | 47 | static int reparent_resources(struct resource *parent, struct resource *res); |
| 48 | static void fixup_rev1_53c810(struct pci_dev* dev); | ||
| 49 | static void fixup_cpc710_pci64(struct pci_dev* dev); | 48 | static void fixup_cpc710_pci64(struct pci_dev* dev); |
| 50 | #ifdef CONFIG_PPC_OF | 49 | #ifdef CONFIG_PPC_OF |
| 51 | static u8* pci_to_OF_bus_map; | 50 | static u8* pci_to_OF_bus_map; |