diff options
author | Grant Likely <grant.likely@secretlab.ca> | 2010-01-29 07:04:33 -0500 |
---|---|---|
committer | Grant Likely <grant.likely@secretlab.ca> | 2010-02-09 10:32:42 -0500 |
commit | fcdeb7fedf89f4bbc2e11959794968080cd8426e (patch) | |
tree | b549ce78d381f6185d10395afdea9ce8f741fd40 /arch/microblaze/include/asm/prom.h | |
parent | 580537140568caddbc8a727d4c2f238d38707f68 (diff) |
of: merge of_attach_node() & of_detach_node()
Merge common code between PowerPC and Microblaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Tested-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/microblaze/include/asm/prom.h')
-rw-r--r-- | arch/microblaze/include/asm/prom.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 07d1063f9aa..6c6b386cf3c 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
@@ -39,10 +39,6 @@ extern struct device_node *of_chosen; | |||
39 | 39 | ||
40 | extern rwlock_t devtree_lock; /* temporary while merging */ | 40 | extern rwlock_t devtree_lock; /* temporary while merging */ |
41 | 41 | ||
42 | /* For updating the device tree at runtime */ | ||
43 | extern void of_attach_node(struct device_node *); | ||
44 | extern void of_detach_node(struct device_node *); | ||
45 | |||
46 | /* Other Prototypes */ | 42 | /* Other Prototypes */ |
47 | extern int early_uartlite_console(void); | 43 | extern int early_uartlite_console(void); |
48 | 44 | ||