summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2013-06-13 14:05:03 +0200
committerRalf Baechle <ralf@linux-mips.org>2013-06-21 18:07:00 +0200
commit73ec78b06ecadb2ce67aae2509e8683ad8b92d14 (patch)
tree45d5c047a9b748141ecc65d0f25bba367b0e96b8 /arch/mips
parent8ea2b8b605d0053fc87abde56ff42b19520322f0 (diff)
downloadlinux-73ec78b06ecadb2ce67aae2509e8683ad8b92d14.tar.gz
linux-73ec78b06ecadb2ce67aae2509e8683ad8b92d14.tar.bz2
linux-73ec78b06ecadb2ce67aae2509e8683ad8b92d14.zip
MIPS: IP27: Fix build errors with CONFIG_PCI disabled.
LD init/built-in.o arch/mips/built-in.o: In function `xtalk_probe_node': (.cpuinit.text+0x67c): undefined reference to `bridge_probe' arch/mips/built-in.o: In function `xtalk_probe_node': (.cpuinit.text+0x7d8): undefined reference to `bridge_probe' Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/include/asm/xtalk/xtalk.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/mips/include/asm/xtalk/xtalk.h b/arch/mips/include/asm/xtalk/xtalk.h
index 680e7efebbaf..26d2ed1fa917 100644
--- a/arch/mips/include/asm/xtalk/xtalk.h
+++ b/arch/mips/include/asm/xtalk/xtalk.h
@@ -47,6 +47,15 @@ typedef struct xtalk_piomap_s *xtalk_piomap_t;
#define XIO_PORT(x) ((xwidgetnum_t)(((x)&XIO_PORT_BITS) >> XIO_PORT_SHIFT))
#define XIO_PACK(p, o) ((((uint64_t)(p))<<XIO_PORT_SHIFT) | ((o)&XIO_ADDR_BITS))
+#ifdef CONFIG_PCI
+extern int bridge_probe(nasid_t nasid, int widget, int masterwid);
+#else
+static inline int bridge_probe(nasid_t nasid, int widget, int masterwid)
+{
+ return 0;
+}
+#endif
+
#endif /* !__ASSEMBLY__ */
#endif /* _ASM_XTALK_XTALK_H */