diff options
| -rw-r--r-- | arch/microblaze/include/asm/prom.h | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/prom.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index ddc5c57eb240..8b1ebd39971a 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h | |||
| @@ -30,8 +30,6 @@ extern struct device_node *of_chosen; | |||
| 30 | 30 | ||
| 31 | #define HAVE_ARCH_DEVTREE_FIXUPS | 31 | #define HAVE_ARCH_DEVTREE_FIXUPS |
| 32 | 32 | ||
| 33 | extern rwlock_t devtree_lock; /* temporary while merging */ | ||
| 34 | |||
| 35 | /* Other Prototypes */ | 33 | /* Other Prototypes */ |
| 36 | extern int early_uartlite_console(void); | 34 | extern int early_uartlite_console(void); |
| 37 | 35 | ||
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index 5bbbdb29f603..4869c937b6cf 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c | |||
| @@ -67,8 +67,6 @@ int __initdata iommu_force_on; | |||
| 67 | unsigned long tce_alloc_start, tce_alloc_end; | 67 | unsigned long tce_alloc_start, tce_alloc_end; |
| 68 | #endif | 68 | #endif |
| 69 | 69 | ||
| 70 | extern rwlock_t devtree_lock; /* temporary while merging */ | ||
| 71 | |||
| 72 | /* export that to outside world */ | 70 | /* export that to outside world */ |
| 73 | struct device_node *of_chosen; | 71 | struct device_node *of_chosen; |
| 74 | 72 | ||
