diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2014-04-21 21:39:31 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-04-29 01:12:26 -0400 |
commit | 8885ec7ca9db1bef558c7bb913829b8fa2d7e1d3 (patch) | |
tree | bd42261cdd7e8d5f426af7cb1244119fb3cd49b3 | |
parent | fd250a664d35d6eb3e09694419c2ee16f23d536a (diff) | |
download | op-kernel-dev-8885ec7ca9db1bef558c7bb913829b8fa2d7e1d3.zip op-kernel-dev-8885ec7ca9db1bef558c7bb913829b8fa2d7e1d3.tar.gz |
sparc32: fix sparse warning in devices.c
Fix following warning:
devices.c:114:13: warning: symbol 'device_scan' was not declared. Should it be static?
Add prototype to asm/setup.h
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/include/asm/setup.h | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/devices.c | 1 | ||||
-rw-r--r-- | arch/sparc/mm/init_32.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/arch/sparc/include/asm/setup.h b/arch/sparc/include/asm/setup.h index c7cd435..622145b 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 3d465e8..b9e9d8c 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 d0c7327..eb82871 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(); |