git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6
[sfrench/cifs-2.6.git]
/
include
/
asm-ppc
/
prom.h
diff --git
a/include/asm-ppc/prom.h
b/include/asm-ppc/prom.h
index 901f7fa8b2d7dbda789913eecd180a6d0cadc588..71f4c996fe750f4453ca7a1a11e2626391ac2887 100644
(file)
--- a/
include/asm-ppc/prom.h
+++ b/
include/asm-ppc/prom.h
@@
-35,7
+35,6
@@
extern unsigned long sub_reloc_offset(unsigned long);
#define machine_is_compatible(x) 0
#define of_find_compatible_node(f, t, c) NULL
#define of_get_property(p, n, l) NULL
-#define get_property(a, b, c) of_get_property((a), (b), (c))
#endif /* _PPC_PROM_H */
#endif /* __KERNEL__ */