From 0e8b4edfa7ce8cb1fb1f66c06fb98dd366d08e3c Mon Sep 17 00:00:00 2001 From: Gabor Juhos Date: Sat, 2 Feb 2013 13:36:48 +0000 Subject: [PATCH] --- yaml --- r: 360082 b: refs/heads/master c: 15b6dcba427d70e61667c28b45e3f090ff00acb1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/include/asm/pci.h | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2ba05dd9b3ba..42e042bcc8c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 222831787704c9ad9215f6b56f975b233968607c +refs/heads/master: 15b6dcba427d70e61667c28b45e3f090ff00acb1 diff --git a/trunk/arch/mips/include/asm/pci.h b/trunk/arch/mips/include/asm/pci.h index d69ea743272b..630645ea5d92 100644 --- a/trunk/arch/mips/include/asm/pci.h +++ b/trunk/arch/mips/include/asm/pci.h @@ -144,8 +144,13 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) extern char * (*pcibios_plat_setup)(char *str); +#ifdef CONFIG_OF /* this function parses memory ranges from a device node */ extern void pci_load_of_ranges(struct pci_controller *hose, struct device_node *node); +#else +static inline void pci_load_of_ranges(struct pci_controller *hose, + struct device_node *node) {} +#endif #endif /* _ASM_PCI_H */