diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2009-08-25 16:07:02 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-08-28 00:24:14 -0400 |
commit | ae14e13a4c8bb091dfd5606fd76c9cd272090ab7 (patch) | |
tree | add3c1539d39f7f9b5fec665acf98db789f9a9fd /arch/powerpc/kernel/pci_32.c | |
parent | bb1af71ecbfdbecbe9f7e43f703da5840b76c2e4 (diff) |
powerpc/pci: Remove dead checks for CONFIG_PPC_OF
PPC_OF is always selected for arch/powerpc. This patch removes the stale
#defines
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel/pci_32.c')
-rw-r--r-- | arch/powerpc/kernel/pci_32.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c index 3ae1c666ff92..1e807fe7ad2c 100644 --- a/arch/powerpc/kernel/pci_32.c +++ b/arch/powerpc/kernel/pci_32.c | |||
@@ -34,9 +34,7 @@ int pcibios_assign_bus_offset = 1; | |||
34 | void pcibios_make_OF_bus_map(void); | 34 | void pcibios_make_OF_bus_map(void); |
35 | 35 | ||
36 | static void fixup_cpc710_pci64(struct pci_dev* dev); | 36 | static void fixup_cpc710_pci64(struct pci_dev* dev); |
37 | #ifdef CONFIG_PPC_OF | ||
38 | static u8* pci_to_OF_bus_map; | 37 | static u8* pci_to_OF_bus_map; |
39 | #endif | ||
40 | 38 | ||
41 | /* By default, we don't re-assign bus numbers. We do this only on | 39 | /* By default, we don't re-assign bus numbers. We do this only on |
42 | * some pmacs | 40 | * some pmacs |
@@ -83,7 +81,6 @@ fixup_cpc710_pci64(struct pci_dev* dev) | |||
83 | } | 81 | } |
84 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64); | 82 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_CPC710_PCI64, fixup_cpc710_pci64); |
85 | 83 | ||
86 | #ifdef CONFIG_PPC_OF | ||
87 | /* | 84 | /* |
88 | * Functions below are used on OpenFirmware machines. | 85 | * Functions below are used on OpenFirmware machines. |
89 | */ | 86 | */ |
@@ -357,12 +354,6 @@ pci_create_OF_bus_map(void) | |||
357 | } | 354 | } |
358 | } | 355 | } |
359 | 356 | ||
360 | #else /* CONFIG_PPC_OF */ | ||
361 | void pcibios_make_OF_bus_map(void) | ||
362 | { | ||
363 | } | ||
364 | #endif /* CONFIG_PPC_OF */ | ||
365 | |||
366 | static void __devinit pcibios_scan_phb(struct pci_controller *hose) | 357 | static void __devinit pcibios_scan_phb(struct pci_controller *hose) |
367 | { | 358 | { |
368 | struct pci_bus *bus; | 359 | struct pci_bus *bus; |