diff options
Diffstat (limited to 'arch/sparc/kernel/ioport.c')
-rw-r--r-- | arch/sparc/kernel/ioport.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 7b17522f59bf..487960919f1f 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c | |||
@@ -49,13 +49,16 @@ | |||
49 | 49 | ||
50 | #define mmu_inval_dma_area(p, l) /* Anton pulled it out for 2.4.0-xx */ | 50 | #define mmu_inval_dma_area(p, l) /* Anton pulled it out for 2.4.0-xx */ |
51 | 51 | ||
52 | struct resource *_sparc_find_resource(struct resource *r, unsigned long); | 52 | static struct resource *_sparc_find_resource(struct resource *r, |
53 | unsigned long); | ||
53 | 54 | ||
54 | static void __iomem *_sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz); | 55 | static void __iomem *_sparc_ioremap(struct resource *res, u32 bus, u32 pa, int sz); |
55 | static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys, | 56 | static void __iomem *_sparc_alloc_io(unsigned int busno, unsigned long phys, |
56 | unsigned long size, char *name); | 57 | unsigned long size, char *name); |
57 | static void _sparc_free_io(struct resource *res); | 58 | static void _sparc_free_io(struct resource *res); |
58 | 59 | ||
60 | static void register_proc_sparc_ioport(void); | ||
61 | |||
59 | /* This points to the next to use virtual memory for DVMA mappings */ | 62 | /* This points to the next to use virtual memory for DVMA mappings */ |
60 | static struct resource _sparc_dvma = { | 63 | static struct resource _sparc_dvma = { |
61 | .name = "sparc_dvma", .start = DVMA_VADDR, .end = DVMA_END - 1 | 64 | .name = "sparc_dvma", .start = DVMA_VADDR, .end = DVMA_END - 1 |
@@ -539,8 +542,6 @@ void __init sbus_setup_arch_props(struct sbus_bus *sbus, struct device_node *dp) | |||
539 | 542 | ||
540 | int __init sbus_arch_preinit(void) | 543 | int __init sbus_arch_preinit(void) |
541 | { | 544 | { |
542 | extern void register_proc_sparc_ioport(void); | ||
543 | |||
544 | register_proc_sparc_ioport(); | 545 | register_proc_sparc_ioport(); |
545 | 546 | ||
546 | #ifdef CONFIG_SUN4 | 547 | #ifdef CONFIG_SUN4 |
@@ -853,8 +854,8 @@ _sparc_io_get_info(char *buf, char **start, off_t fpos, int length, int *eof, | |||
853 | * XXX Too slow. Can have 8192 DVMA pages on sun4m in the worst case. | 854 | * XXX Too slow. Can have 8192 DVMA pages on sun4m in the worst case. |
854 | * This probably warrants some sort of hashing. | 855 | * This probably warrants some sort of hashing. |
855 | */ | 856 | */ |
856 | struct resource * | 857 | static struct resource *_sparc_find_resource(struct resource *root, |
857 | _sparc_find_resource(struct resource *root, unsigned long hit) | 858 | unsigned long hit) |
858 | { | 859 | { |
859 | struct resource *tmp; | 860 | struct resource *tmp; |
860 | 861 | ||
@@ -865,7 +866,7 @@ _sparc_find_resource(struct resource *root, unsigned long hit) | |||
865 | return NULL; | 866 | return NULL; |
866 | } | 867 | } |
867 | 868 | ||
868 | void register_proc_sparc_ioport(void) | 869 | static void register_proc_sparc_ioport(void) |
869 | { | 870 | { |
870 | #ifdef CONFIG_PROC_FS | 871 | #ifdef CONFIG_PROC_FS |
871 | create_proc_read_entry("io_map",0,NULL,_sparc_io_get_info,&sparc_iomap); | 872 | create_proc_read_entry("io_map",0,NULL,_sparc_io_get_info,&sparc_iomap); |