diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h
index c7cd435f919f3d0196dcfe88a2b01257d0d84102..622145bf2e9a0c833bab996a7edc26bbd12968a9 100644
--- a/arch/sparc/include/asm/setup.h
+++ b/arch/sparc/include/asm/setup.h
@@ -39,6 +39,9 @@ int sparc_floppy_request_irq(unsigned int irq, irq_handler_t irq_handler);
 /* setup_32.c */
 extern unsigned long cmdline_memory_size;
 
+/* devices.c */
+void __init device_scan(void);
+
 #endif
 
 extern void sun_do_break(void);
diff --git a/arch/sparc/kernel/devices.c b/arch/sparc/kernel/devices.c
index 3d465e87f7e247db101d757fff4abbfeac9b3719..b9e9d8c1bd3cb342f3baf3471557ae466b11f41a 100644
--- a/arch/sparc/kernel/devices.c
+++ b/arch/sparc/kernel/devices.c
@@ -19,6 +19,7 @@
 #include <asm/smp.h>
 #include <asm/cpudata.h>
 #include <asm/cpu_type.h>
+#include <asm/setup.h>
 
 extern void clock_stop_probe(void); /* tadpole.c */
 
diff --git a/arch/sparc/mm/init_32.c b/arch/sparc/mm/init_32.c
index d0c732727f444a97f79c5179a6ef98cfe879958e..eb828715527971b050faa9e40693218c7e25db27 100644
--- a/arch/sparc/mm/init_32.c
+++ b/arch/sparc/mm/init_32.c
@@ -248,8 +248,6 @@ unsigned long __init bootmem_init(unsigned long *pages_avail)
  * init routine based upon the Sun model type on the Sparc.
  *
  */
-extern void device_scan(void);
-
 void __init paging_init(void)
 {
 	srmmu_paging_init();