diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-05 01:30:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:24 -0500 |
commit | a3b2004a2671455ee7aef1d9aee5a24381999ddb (patch) | |
tree | 046d7e755e2a30a1c5d54de383362ca04220cd36 | |
parent | 8b169fa2c942bc2a579da3f33986bd3fc48d9684 (diff) |
m68k: kill arch/m68k/atari/atari_ksyms.c
EXPORT_SYMBOL's belong to the actual code.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | arch/m68k/atari/Makefile | 2 | ||||
-rw-r--r-- | arch/m68k/atari/ataints.c | 3 | ||||
-rw-r--r-- | arch/m68k/atari/atari_ksyms.c | 35 | ||||
-rw-r--r-- | arch/m68k/atari/atasound.c | 2 | ||||
-rw-r--r-- | arch/m68k/atari/config.c | 11 | ||||
-rw-r--r-- | arch/m68k/atari/debug.c | 6 | ||||
-rw-r--r-- | arch/m68k/atari/stdma.c | 5 | ||||
-rw-r--r-- | arch/m68k/atari/stram.c | 3 |
8 files changed, 31 insertions, 36 deletions
diff --git a/arch/m68k/atari/Makefile b/arch/m68k/atari/Makefile index 2cb86191f0aa..2cd905efe63a 100644 --- a/arch/m68k/atari/Makefile +++ b/arch/m68k/atari/Makefile | |||
@@ -3,7 +3,7 @@ | |||
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := config.o time.o debug.o ataints.o stdma.o \ | 5 | obj-y := config.o time.o debug.o ataints.o stdma.o \ |
6 | atasound.o stram.o atari_ksyms.o | 6 | atasound.o stram.o |
7 | 7 | ||
8 | ifeq ($(CONFIG_PCI),y) | 8 | ifeq ($(CONFIG_PCI),y) |
9 | obj-$(CONFIG_HADES) += hades-pci.o | 9 | obj-$(CONFIG_HADES) += hades-pci.o |
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index b85ca22024c1..b45593a60bdd 100644 --- a/arch/m68k/atari/ataints.c +++ b/arch/m68k/atari/ataints.c | |||
@@ -40,6 +40,7 @@ | |||
40 | #include <linux/kernel_stat.h> | 40 | #include <linux/kernel_stat.h> |
41 | #include <linux/init.h> | 41 | #include <linux/init.h> |
42 | #include <linux/seq_file.h> | 42 | #include <linux/seq_file.h> |
43 | #include <linux/module.h> | ||
43 | 44 | ||
44 | #include <asm/system.h> | 45 | #include <asm/system.h> |
45 | #include <asm/traps.h> | 46 | #include <asm/traps.h> |
@@ -446,6 +447,7 @@ unsigned long atari_register_vme_int(void) | |||
446 | free_vme_vec_bitmap |= 1 << i; | 447 | free_vme_vec_bitmap |= 1 << i; |
447 | return VME_SOURCE_BASE + i; | 448 | return VME_SOURCE_BASE + i; |
448 | } | 449 | } |
450 | EXPORT_SYMBOL(atari_register_vme_int); | ||
449 | 451 | ||
450 | 452 | ||
451 | void atari_unregister_vme_int(unsigned long irq) | 453 | void atari_unregister_vme_int(unsigned long irq) |
@@ -455,5 +457,6 @@ void atari_unregister_vme_int(unsigned long irq) | |||
455 | free_vme_vec_bitmap &= ~(1 << irq); | 457 | free_vme_vec_bitmap &= ~(1 << irq); |
456 | } | 458 | } |
457 | } | 459 | } |
460 | EXPORT_SYMBOL(atari_unregister_vme_int); | ||
458 | 461 | ||
459 | 462 | ||
diff --git a/arch/m68k/atari/atari_ksyms.c b/arch/m68k/atari/atari_ksyms.c deleted file mode 100644 index a04757151538..000000000000 --- a/arch/m68k/atari/atari_ksyms.c +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | #include <linux/module.h> | ||
2 | |||
3 | #include <asm/ptrace.h> | ||
4 | #include <asm/traps.h> | ||
5 | #include <asm/atarihw.h> | ||
6 | #include <asm/atariints.h> | ||
7 | #include <asm/atarikb.h> | ||
8 | #include <asm/atari_joystick.h> | ||
9 | #include <asm/atari_stdma.h> | ||
10 | #include <asm/atari_stram.h> | ||
11 | |||
12 | extern void atari_microwire_cmd( int cmd ); | ||
13 | extern int atari_MFP_init_done; | ||
14 | extern int atari_SCC_init_done; | ||
15 | extern int atari_SCC_reset_done; | ||
16 | |||
17 | EXPORT_SYMBOL(atari_mch_cookie); | ||
18 | EXPORT_SYMBOL(atari_mch_type); | ||
19 | EXPORT_SYMBOL(atari_hw_present); | ||
20 | EXPORT_SYMBOL(atari_switches); | ||
21 | EXPORT_SYMBOL(atari_dont_touch_floppy_select); | ||
22 | EXPORT_SYMBOL(atari_register_vme_int); | ||
23 | EXPORT_SYMBOL(atari_unregister_vme_int); | ||
24 | EXPORT_SYMBOL(stdma_lock); | ||
25 | EXPORT_SYMBOL(stdma_release); | ||
26 | EXPORT_SYMBOL(stdma_others_waiting); | ||
27 | EXPORT_SYMBOL(stdma_islocked); | ||
28 | EXPORT_SYMBOL(atari_stram_alloc); | ||
29 | EXPORT_SYMBOL(atari_stram_free); | ||
30 | |||
31 | EXPORT_SYMBOL(atari_MFP_init_done); | ||
32 | EXPORT_SYMBOL(atari_SCC_init_done); | ||
33 | EXPORT_SYMBOL(atari_SCC_reset_done); | ||
34 | |||
35 | EXPORT_SYMBOL(atari_microwire_cmd); | ||
diff --git a/arch/m68k/atari/atasound.c b/arch/m68k/atari/atasound.c index ee04250eb56b..d266fe89c125 100644 --- a/arch/m68k/atari/atasound.c +++ b/arch/m68k/atari/atasound.c | |||
@@ -22,6 +22,7 @@ | |||
22 | #include <linux/fcntl.h> | 22 | #include <linux/fcntl.h> |
23 | #include <linux/errno.h> | 23 | #include <linux/errno.h> |
24 | #include <linux/mm.h> | 24 | #include <linux/mm.h> |
25 | #include <linux/module.h> | ||
25 | 26 | ||
26 | #include <asm/atarihw.h> | 27 | #include <asm/atarihw.h> |
27 | #include <asm/system.h> | 28 | #include <asm/system.h> |
@@ -43,6 +44,7 @@ void atari_microwire_cmd (int cmd) | |||
43 | while( tt_microwire.mask != 0x7ff) | 44 | while( tt_microwire.mask != 0x7ff) |
44 | ; | 45 | ; |
45 | } | 46 | } |
47 | EXPORT_SYMBOL(atari_microwire_cmd); | ||
46 | 48 | ||
47 | 49 | ||
48 | /* PSG base frequency */ | 50 | /* PSG base frequency */ |
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index e40e5dcaa347..5945e1505558 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c | |||
@@ -31,6 +31,7 @@ | |||
31 | #include <linux/delay.h> | 31 | #include <linux/delay.h> |
32 | #include <linux/ioport.h> | 32 | #include <linux/ioport.h> |
33 | #include <linux/vt_kern.h> | 33 | #include <linux/vt_kern.h> |
34 | #include <linux/module.h> | ||
34 | 35 | ||
35 | #include <asm/bootinfo.h> | 36 | #include <asm/bootinfo.h> |
36 | #include <asm/setup.h> | 37 | #include <asm/setup.h> |
@@ -43,10 +44,20 @@ | |||
43 | #include <asm/io.h> | 44 | #include <asm/io.h> |
44 | 45 | ||
45 | u_long atari_mch_cookie; | 46 | u_long atari_mch_cookie; |
47 | EXPORT_SYMBOL(atari_mch_cookie); | ||
48 | |||
46 | u_long atari_mch_type; | 49 | u_long atari_mch_type; |
50 | EXPORT_SYMBOL(atari_mch_type); | ||
51 | |||
47 | struct atari_hw_present atari_hw_present; | 52 | struct atari_hw_present atari_hw_present; |
53 | EXPORT_SYMBOL(atari_hw_present); | ||
54 | |||
48 | u_long atari_switches; | 55 | u_long atari_switches; |
56 | EXPORT_SYMBOL(atari_switches); | ||
57 | |||
49 | int atari_dont_touch_floppy_select; | 58 | int atari_dont_touch_floppy_select; |
59 | EXPORT_SYMBOL(atari_dont_touch_floppy_select); | ||
60 | |||
50 | int atari_rtc_year_offset; | 61 | int atari_rtc_year_offset; |
51 | 62 | ||
52 | /* local function prototypes */ | 63 | /* local function prototypes */ |
diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c index fbeed8c8ecbc..043ddbc61c7b 100644 --- a/arch/m68k/atari/debug.c +++ b/arch/m68k/atari/debug.c | |||
@@ -15,17 +15,23 @@ | |||
15 | #include <linux/console.h> | 15 | #include <linux/console.h> |
16 | #include <linux/init.h> | 16 | #include <linux/init.h> |
17 | #include <linux/delay.h> | 17 | #include <linux/delay.h> |
18 | #include <linux/module.h> | ||
18 | 19 | ||
19 | #include <asm/atarihw.h> | 20 | #include <asm/atarihw.h> |
20 | #include <asm/atariints.h> | 21 | #include <asm/atariints.h> |
21 | 22 | ||
22 | /* Flag that Modem1 port is already initialized and used */ | 23 | /* Flag that Modem1 port is already initialized and used */ |
23 | int atari_MFP_init_done; | 24 | int atari_MFP_init_done; |
25 | EXPORT_SYMBOL(atari_MFP_init_done); | ||
26 | |||
24 | /* Flag that Modem1 port is already initialized and used */ | 27 | /* Flag that Modem1 port is already initialized and used */ |
25 | int atari_SCC_init_done; | 28 | int atari_SCC_init_done; |
29 | EXPORT_SYMBOL(atari_SCC_init_done); | ||
30 | |||
26 | /* Can be set somewhere, if a SCC master reset has already be done and should | 31 | /* Can be set somewhere, if a SCC master reset has already be done and should |
27 | * not be repeated; used by kgdb */ | 32 | * not be repeated; used by kgdb */ |
28 | int atari_SCC_reset_done; | 33 | int atari_SCC_reset_done; |
34 | EXPORT_SYMBOL(atari_SCC_reset_done); | ||
29 | 35 | ||
30 | static struct console atari_console_driver = { | 36 | static struct console atari_console_driver = { |
31 | .name = "debug", | 37 | .name = "debug", |
diff --git a/arch/m68k/atari/stdma.c b/arch/m68k/atari/stdma.c index ab3fd5202b24..d1bd029a34ac 100644 --- a/arch/m68k/atari/stdma.c +++ b/arch/m68k/atari/stdma.c | |||
@@ -35,6 +35,7 @@ | |||
35 | #include <linux/init.h> | 35 | #include <linux/init.h> |
36 | #include <linux/interrupt.h> | 36 | #include <linux/interrupt.h> |
37 | #include <linux/wait.h> | 37 | #include <linux/wait.h> |
38 | #include <linux/module.h> | ||
38 | 39 | ||
39 | #include <asm/atari_stdma.h> | 40 | #include <asm/atari_stdma.h> |
40 | #include <asm/atariints.h> | 41 | #include <asm/atariints.h> |
@@ -91,6 +92,7 @@ void stdma_lock(irq_handler_t handler, void *data) | |||
91 | stdma_isr_data = data; | 92 | stdma_isr_data = data; |
92 | local_irq_restore(flags); | 93 | local_irq_restore(flags); |
93 | } | 94 | } |
95 | EXPORT_SYMBOL(stdma_lock); | ||
94 | 96 | ||
95 | 97 | ||
96 | /* | 98 | /* |
@@ -117,6 +119,7 @@ void stdma_release(void) | |||
117 | 119 | ||
118 | local_irq_restore(flags); | 120 | local_irq_restore(flags); |
119 | } | 121 | } |
122 | EXPORT_SYMBOL(stdma_release); | ||
120 | 123 | ||
121 | 124 | ||
122 | /* | 125 | /* |
@@ -134,6 +137,7 @@ int stdma_others_waiting(void) | |||
134 | { | 137 | { |
135 | return waitqueue_active(&stdma_wait); | 138 | return waitqueue_active(&stdma_wait); |
136 | } | 139 | } |
140 | EXPORT_SYMBOL(stdma_others_waiting); | ||
137 | 141 | ||
138 | 142 | ||
139 | /* | 143 | /* |
@@ -155,6 +159,7 @@ int stdma_islocked(void) | |||
155 | { | 159 | { |
156 | return stdma_locked; | 160 | return stdma_locked; |
157 | } | 161 | } |
162 | EXPORT_SYMBOL(stdma_islocked); | ||
158 | 163 | ||
159 | 164 | ||
160 | /* | 165 | /* |
diff --git a/arch/m68k/atari/stram.c b/arch/m68k/atari/stram.c index bf4588cbe371..8dda6515887a 100644 --- a/arch/m68k/atari/stram.c +++ b/arch/m68k/atari/stram.c | |||
@@ -20,6 +20,7 @@ | |||
20 | #include <linux/bootmem.h> | 20 | #include <linux/bootmem.h> |
21 | #include <linux/mount.h> | 21 | #include <linux/mount.h> |
22 | #include <linux/blkdev.h> | 22 | #include <linux/blkdev.h> |
23 | #include <linux/module.h> | ||
23 | 24 | ||
24 | #include <asm/setup.h> | 25 | #include <asm/setup.h> |
25 | #include <asm/machdep.h> | 26 | #include <asm/machdep.h> |
@@ -208,6 +209,7 @@ void *atari_stram_alloc(long size, const char *owner) | |||
208 | } | 209 | } |
209 | return( addr ); | 210 | return( addr ); |
210 | } | 211 | } |
212 | EXPORT_SYMBOL(atari_stram_alloc); | ||
211 | 213 | ||
212 | void atari_stram_free( void *addr ) | 214 | void atari_stram_free( void *addr ) |
213 | 215 | ||
@@ -237,6 +239,7 @@ void atari_stram_free( void *addr ) | |||
237 | printk( KERN_ERR "atari_stram_free: cannot free block at %p " | 239 | printk( KERN_ERR "atari_stram_free: cannot free block at %p " |
238 | "(called from %p)\n", addr, __builtin_return_address(0) ); | 240 | "(called from %p)\n", addr, __builtin_return_address(0) ); |
239 | } | 241 | } |
242 | EXPORT_SYMBOL(atari_stram_free); | ||
240 | 243 | ||
241 | 244 | ||
242 | /* ------------------------------------------------------------------------ */ | 245 | /* ------------------------------------------------------------------------ */ |