diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-09 11:27:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-09 11:27:25 -0400 |
| commit | e7bc15a9ad07269c48732e9a9874e5938b4700ee (patch) | |
| tree | dfe010e71720a534a15bb38cd454c7f80db2b1f3 /include/asm-sparc/prom.h | |
| parent | 5a0276b7ae1fcd90cea07f65452aebbd1b0743c5 (diff) | |
| parent | b434e71933aa0519ee042c01419db76b7dcc058e (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix memory leak when cpu hotplugging.
[SPARC64]: Do not assume sun4v chips have load-twin/store-init support.
[SPARC64]: Fix hard-coding of cpu type output in /proc/cpuinfo on sun4v.
[SPARC]: Centralize find_in_proplist() instead of duplicating N times.
Diffstat (limited to 'include/asm-sparc/prom.h')
| -rw-r--r-- | include/asm-sparc/prom.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sparc/prom.h b/include/asm-sparc/prom.h index 350676c589f9..71f2a1998324 100644 --- a/include/asm-sparc/prom.h +++ b/include/asm-sparc/prom.h | |||
| @@ -67,6 +67,7 @@ extern int of_set_property(struct device_node *node, const char *name, void *val | |||
| 67 | extern int of_getintprop_default(struct device_node *np, | 67 | extern int of_getintprop_default(struct device_node *np, |
| 68 | const char *name, | 68 | const char *name, |
| 69 | int def); | 69 | int def); |
| 70 | extern int of_find_in_proplist(const char *list, const char *match, int len); | ||
| 70 | 71 | ||
| 71 | extern void prom_build_devicetree(void); | 72 | extern void prom_build_devicetree(void); |
| 72 | 73 | ||