diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 22:07:01 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2009-11-23 22:07:01 -0500 |
| commit | 41f880091c15b039ffcc8b3d831656b81517a6d3 (patch) | |
| tree | a9919151491356b6445ecd9c613a60f69d207927 /arch/microblaze/include | |
| parent | bbd33931a08362f78266a4016211a35947b91041 (diff) | |
of/flattree: Merge unflatten_device_tree
Merge common code between PowerPC and MicroBlaze
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Reviewed-by: Wolfram Sang <w.sang@pengutronix.de>
Tested-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze/include')
| -rw-r--r-- | arch/microblaze/include/asm/prom.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index ef3ec1d6ceb3..07d1063f9aae 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
| @@ -37,7 +37,6 @@ extern struct device_node *of_chosen; | |||
| 37 | 37 | ||
| 38 | #define HAVE_ARCH_DEVTREE_FIXUPS | 38 | #define HAVE_ARCH_DEVTREE_FIXUPS |
| 39 | 39 | ||
| 40 | extern struct device_node *allnodes; /* temporary while merging */ | ||
| 41 | extern rwlock_t devtree_lock; /* temporary while merging */ | 40 | extern rwlock_t devtree_lock; /* temporary while merging */ |
| 42 | 41 | ||
| 43 | /* For updating the device tree at runtime */ | 42 | /* For updating the device tree at runtime */ |