diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-23 05:43:14 -0400 |
| commit | ac0c955d5048c2c580fa7166a89133f0fd76c125 (patch) | |
| tree | 041ac4fb544c7244a1a0b35c8ceabc142d5645c1 /include/asm-sparc64/prom.h | |
| parent | 68d09b1b6780415d82160f6b6d88e82bd724e691 (diff) | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-sparc64/prom.h')
| -rw-r--r-- | include/asm-sparc64/prom.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sparc64/prom.h b/include/asm-sparc64/prom.h index 31dcb92fbae0..07843f9f05df 100644 --- a/include/asm-sparc64/prom.h +++ b/include/asm-sparc64/prom.h | |||
| @@ -76,6 +76,7 @@ extern int of_set_property(struct device_node *node, const char *name, void *val | |||
| 76 | extern int of_getintprop_default(struct device_node *np, | 76 | extern int of_getintprop_default(struct device_node *np, |
| 77 | const char *name, | 77 | const char *name, |
| 78 | int def); | 78 | int def); |
| 79 | extern int of_find_in_proplist(const char *list, const char *match, int len); | ||
| 79 | 80 | ||
| 80 | extern void prom_build_devicetree(void); | 81 | extern void prom_build_devicetree(void); |
| 81 | 82 | ||