diff options
author | Steve French <sfrench@us.ibm.com> | 2005-11-10 15:34:57 -0800 |
---|---|---|
committer | Steve French <sfrench@us.ibm.com> | 2005-11-10 15:34:57 -0800 |
commit | 9551583e55e26a0940894828c2d1066e9276325e (patch) | |
tree | ff412949400da94aa788bd094ced2138e9175935 /include/asm-ppc64/prom.h | |
parent | a2653ebab3a96c6e6183360821faa492c1f88c3f (diff) | |
parent | 985834a1c3a2e9639145bd8ea16af6e25f2143ad (diff) | |
download | op-kernel-dev-9551583e55e26a0940894828c2d1066e9276325e.zip op-kernel-dev-9551583e55e26a0940894828c2d1066e9276325e.tar.gz |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-ppc64/prom.h')
-rw-r--r-- | include/asm-ppc64/prom.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-ppc64/prom.h b/include/asm-ppc64/prom.h index 76bb026..ddfe186 100644 --- a/include/asm-ppc64/prom.h +++ b/include/asm-ppc64/prom.h @@ -204,6 +204,8 @@ extern void of_detach_node(const struct device_node *); extern unsigned long prom_init(unsigned long, unsigned long, unsigned long, unsigned long, unsigned long); extern void finish_device_tree(void); +extern void unflatten_device_tree(void); +extern void early_init_devtree(void *); extern int device_is_compatible(struct device_node *device, const char *); extern int machine_is_compatible(const char *compat); extern unsigned char *get_property(struct device_node *node, const char *name, |