diff --git a/[refs] b/[refs] index d0f3826a642b..8d2e56cb61b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e10590475b4a6d848e20c19fb22b074075c9ef3 +refs/heads/master: 26b6d5b170815ab0586ff983b4ce7c8cc19e1e81 diff --git a/trunk/arch/powerpc/platforms/iseries/pci.h b/trunk/arch/powerpc/platforms/iseries/pci.h index 33a8489fde54..730986bc917a 100644 --- a/trunk/arch/powerpc/platforms/iseries/pci.h +++ b/trunk/arch/powerpc/platforms/iseries/pci.h @@ -59,5 +59,10 @@ static inline u64 iseries_ds_addr(struct device_node *node) } extern void iSeries_Device_Information(struct pci_dev*, int); +#ifdef CONFIG_PCI +extern void iSeries_pci_final_fixup(void); +#else +static void iSeries_pci_final_fixup(void) { } +#endif #endif /* _PLATFORMS_ISERIES_PCI_H */ diff --git a/trunk/arch/powerpc/platforms/iseries/setup.c b/trunk/arch/powerpc/platforms/iseries/setup.c index 0877a8834110..8a652da2afc3 100644 --- a/trunk/arch/powerpc/platforms/iseries/setup.c +++ b/trunk/arch/powerpc/platforms/iseries/setup.c @@ -63,6 +63,7 @@ #include "main_store.h" #include "call_sm.h" #include "call_hpt.h" +#include "pci.h" #ifdef DEBUG #define DBG(fmt...) udbg_printf(fmt) @@ -74,11 +75,6 @@ static unsigned long build_iSeries_Memory_Map(void); static void iseries_shared_idle(void); static void iseries_dedicated_idle(void); -#ifdef CONFIG_PCI -extern void iSeries_pci_final_fixup(void); -#else -static void iSeries_pci_final_fixup(void) { } -#endif struct MemoryBlock {