summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 10:05:10 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 10:05:10 -0800
commitfc03da1ca1954f103ed57daf90611cefa57b07e0 (patch)
tree2b9b44b1a39f7743c1c3d7bc89654792686d7dbc /include/asm-ppc
parentcaf5b04c82f05c65843b2d7189845d6c3df5a41e (diff)
parente05b3b4adbaeea508bd1c195f1f2e22c8251176b (diff)
downloadop-kernel-dev-fc03da1ca1954f103ed57daf90611cefa57b07e0.zip
op-kernel-dev-fc03da1ca1954f103ed57daf90611cefa57b07e0.tar.gz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'include/asm-ppc')
-rw-r--r--include/asm-ppc/prom.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-ppc/prom.h b/include/asm-ppc/prom.h
index eb317a0..6d431d6 100644
--- a/include/asm-ppc/prom.h
+++ b/include/asm-ppc/prom.h
@@ -167,6 +167,14 @@ extern int of_address_to_resource(struct device_node *dev, int index,
extern int of_pci_address_to_resource(struct device_node *dev, int bar,
struct resource *r);
+#ifndef CONFIG_PPC_OF
+/*
+ * Fallback definitions for builds where we don't have prom.c included.
+ */
+#define machine_is_compatible(x) 0
+#define of_find_compatible_node(f, t, c) NULL
+#define get_property(p, n, l) NULL
+#endif
#endif /* _PPC_PROM_H */
#endif /* __KERNEL__ */
OpenPOWER on IntegriCloud