diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-02-05 01:30:25 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 12:44:23 -0500 |
commit | 8b169fa2c942bc2a579da3f33986bd3fc48d9684 (patch) | |
tree | cc5a663d53f530cb10abd9f41516157e2b31f7fe /arch | |
parent | 3456fef5d988e9014cd318a3ae7991c9a03c8cf2 (diff) |
m68k: kill arch/m68k/amiga/amiga_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>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/m68k/amiga/Makefile | 2 | ||||
-rw-r--r-- | arch/m68k/amiga/amiga_ksyms.c | 33 | ||||
-rw-r--r-- | arch/m68k/amiga/amisound.c | 3 | ||||
-rw-r--r-- | arch/m68k/amiga/chipram.c | 7 | ||||
-rw-r--r-- | arch/m68k/amiga/config.c | 12 | ||||
-rw-r--r-- | arch/m68k/amiga/pcmcia.c | 9 |
6 files changed, 32 insertions, 34 deletions
diff --git a/arch/m68k/amiga/Makefile b/arch/m68k/amiga/Makefile index 8b415651edee..6a0d7650f980 100644 --- a/arch/m68k/amiga/Makefile +++ b/arch/m68k/amiga/Makefile | |||
@@ -2,6 +2,6 @@ | |||
2 | # Makefile for Linux arch/m68k/amiga source directory | 2 | # Makefile for Linux arch/m68k/amiga source directory |
3 | # | 3 | # |
4 | 4 | ||
5 | obj-y := config.o amiints.o cia.o chipram.o amisound.o amiga_ksyms.o | 5 | obj-y := config.o amiints.o cia.o chipram.o amisound.o |
6 | 6 | ||
7 | obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o | 7 | obj-$(CONFIG_AMIGA_PCMCIA) += pcmcia.o |
diff --git a/arch/m68k/amiga/amiga_ksyms.c b/arch/m68k/amiga/amiga_ksyms.c deleted file mode 100644 index 7fdcf6bf3ada..000000000000 --- a/arch/m68k/amiga/amiga_ksyms.c +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | #include <linux/module.h> | ||
2 | #include <linux/types.h> | ||
3 | #include <asm/ptrace.h> | ||
4 | #include <asm/amigahw.h> | ||
5 | #include <asm/amigaints.h> | ||
6 | #include <asm/amipcmcia.h> | ||
7 | |||
8 | extern volatile u_short amiga_audio_min_period; | ||
9 | extern u_short amiga_audio_period; | ||
10 | |||
11 | /* | ||
12 | * Add things here when you find the need for it. | ||
13 | */ | ||
14 | EXPORT_SYMBOL(amiga_model); | ||
15 | EXPORT_SYMBOL(amiga_chipset); | ||
16 | EXPORT_SYMBOL(amiga_hw_present); | ||
17 | EXPORT_SYMBOL(amiga_eclock); | ||
18 | EXPORT_SYMBOL(amiga_colorclock); | ||
19 | EXPORT_SYMBOL(amiga_chip_alloc); | ||
20 | EXPORT_SYMBOL(amiga_chip_free); | ||
21 | EXPORT_SYMBOL(amiga_chip_avail); | ||
22 | EXPORT_SYMBOL(amiga_chip_size); | ||
23 | EXPORT_SYMBOL(amiga_audio_period); | ||
24 | EXPORT_SYMBOL(amiga_audio_min_period); | ||
25 | |||
26 | #ifdef CONFIG_AMIGA_PCMCIA | ||
27 | EXPORT_SYMBOL(pcmcia_reset); | ||
28 | EXPORT_SYMBOL(pcmcia_copy_tuple); | ||
29 | EXPORT_SYMBOL(pcmcia_program_voltage); | ||
30 | EXPORT_SYMBOL(pcmcia_access_speed); | ||
31 | EXPORT_SYMBOL(pcmcia_write_enable); | ||
32 | EXPORT_SYMBOL(pcmcia_write_disable); | ||
33 | #endif | ||
diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c index 92a92fbb6122..61e5c54625ae 100644 --- a/arch/m68k/amiga/amisound.c +++ b/arch/m68k/amiga/amisound.c | |||
@@ -12,6 +12,7 @@ | |||
12 | #include <linux/timer.h> | 12 | #include <linux/timer.h> |
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/string.h> | 14 | #include <linux/string.h> |
15 | #include <linux/module.h> | ||
15 | 16 | ||
16 | #include <asm/system.h> | 17 | #include <asm/system.h> |
17 | #include <asm/amigahw.h> | 18 | #include <asm/amigahw.h> |
@@ -31,6 +32,7 @@ static const signed char sine_data[] = { | |||
31 | */ | 32 | */ |
32 | 33 | ||
33 | volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */ | 34 | volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */ |
35 | EXPORT_SYMBOL(amiga_audio_min_period); | ||
34 | 36 | ||
35 | #define MAX_PERIOD (65535) | 37 | #define MAX_PERIOD (65535) |
36 | 38 | ||
@@ -40,6 +42,7 @@ volatile unsigned short amiga_audio_min_period = 124; /* Default for pre-OCS */ | |||
40 | */ | 42 | */ |
41 | 43 | ||
42 | unsigned short amiga_audio_period = MAX_PERIOD; | 44 | unsigned short amiga_audio_period = MAX_PERIOD; |
45 | EXPORT_SYMBOL(amiga_audio_period); | ||
43 | 46 | ||
44 | static unsigned long clock_constant; | 47 | static unsigned long clock_constant; |
45 | 48 | ||
diff --git a/arch/m68k/amiga/chipram.c b/arch/m68k/amiga/chipram.c index fa015d801617..d10726f9038b 100644 --- a/arch/m68k/amiga/chipram.c +++ b/arch/m68k/amiga/chipram.c | |||
@@ -13,10 +13,13 @@ | |||
13 | #include <linux/ioport.h> | 13 | #include <linux/ioport.h> |
14 | #include <linux/slab.h> | 14 | #include <linux/slab.h> |
15 | #include <linux/string.h> | 15 | #include <linux/string.h> |
16 | #include <linux/module.h> | ||
17 | |||
16 | #include <asm/page.h> | 18 | #include <asm/page.h> |
17 | #include <asm/amigahw.h> | 19 | #include <asm/amigahw.h> |
18 | 20 | ||
19 | unsigned long amiga_chip_size; | 21 | unsigned long amiga_chip_size; |
22 | EXPORT_SYMBOL(amiga_chip_size); | ||
20 | 23 | ||
21 | static struct resource chipram_res = { | 24 | static struct resource chipram_res = { |
22 | .name = "Chip RAM", .start = CHIP_PHYSADDR | 25 | .name = "Chip RAM", .start = CHIP_PHYSADDR |
@@ -67,6 +70,7 @@ void *amiga_chip_alloc(unsigned long size, const char *name) | |||
67 | #endif | 70 | #endif |
68 | return (void *)ZTWO_VADDR(res->start); | 71 | return (void *)ZTWO_VADDR(res->start); |
69 | } | 72 | } |
73 | EXPORT_SYMBOL(amiga_chip_alloc); | ||
70 | 74 | ||
71 | 75 | ||
72 | /* | 76 | /* |
@@ -120,6 +124,7 @@ void amiga_chip_free(void *ptr) | |||
120 | } | 124 | } |
121 | printk("amiga_chip_free: trying to free nonexistent region at %p\n", ptr); | 125 | printk("amiga_chip_free: trying to free nonexistent region at %p\n", ptr); |
122 | } | 126 | } |
127 | EXPORT_SYMBOL(amiga_chip_free); | ||
123 | 128 | ||
124 | 129 | ||
125 | unsigned long amiga_chip_avail(void) | 130 | unsigned long amiga_chip_avail(void) |
@@ -129,3 +134,5 @@ unsigned long amiga_chip_avail(void) | |||
129 | #endif | 134 | #endif |
130 | return chipavail; | 135 | return chipavail; |
131 | } | 136 | } |
137 | EXPORT_SYMBOL(amiga_chip_avail); | ||
138 | |||
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 35748531327d..50f5daab46b7 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c | |||
@@ -23,6 +23,7 @@ | |||
23 | #include <linux/delay.h> | 23 | #include <linux/delay.h> |
24 | #include <linux/interrupt.h> | 24 | #include <linux/interrupt.h> |
25 | #include <linux/zorro.h> | 25 | #include <linux/zorro.h> |
26 | #include <linux/module.h> | ||
26 | 27 | ||
27 | #include <asm/bootinfo.h> | 28 | #include <asm/bootinfo.h> |
28 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
@@ -36,13 +37,24 @@ | |||
36 | #include <asm/io.h> | 37 | #include <asm/io.h> |
37 | 38 | ||
38 | unsigned long amiga_model; | 39 | unsigned long amiga_model; |
40 | EXPORT_SYMBOL(amiga_model); | ||
41 | |||
39 | unsigned long amiga_eclock; | 42 | unsigned long amiga_eclock; |
43 | EXPORT_SYMBOL(amiga_eclock); | ||
44 | |||
40 | unsigned long amiga_masterclock; | 45 | unsigned long amiga_masterclock; |
46 | |||
41 | unsigned long amiga_colorclock; | 47 | unsigned long amiga_colorclock; |
48 | EXPORT_SYMBOL(amiga_colorclock); | ||
49 | |||
42 | unsigned long amiga_chipset; | 50 | unsigned long amiga_chipset; |
51 | EXPORT_SYMBOL(amiga_chipset); | ||
52 | |||
43 | unsigned char amiga_vblank; | 53 | unsigned char amiga_vblank; |
44 | unsigned char amiga_psfreq; | 54 | unsigned char amiga_psfreq; |
55 | |||
45 | struct amiga_hw_present amiga_hw_present; | 56 | struct amiga_hw_present amiga_hw_present; |
57 | EXPORT_SYMBOL(amiga_hw_present); | ||
46 | 58 | ||
47 | static char s_a500[] __initdata = "A500"; | 59 | static char s_a500[] __initdata = "A500"; |
48 | static char s_a500p[] __initdata = "A500+"; | 60 | static char s_a500p[] __initdata = "A500+"; |
diff --git a/arch/m68k/amiga/pcmcia.c b/arch/m68k/amiga/pcmcia.c index 186662ca1a89..7106f0c3639b 100644 --- a/arch/m68k/amiga/pcmcia.c +++ b/arch/m68k/amiga/pcmcia.c | |||
@@ -15,6 +15,8 @@ | |||
15 | #include <linux/types.h> | 15 | #include <linux/types.h> |
16 | #include <linux/jiffies.h> | 16 | #include <linux/jiffies.h> |
17 | #include <linux/timer.h> | 17 | #include <linux/timer.h> |
18 | #include <linux/module.h> | ||
19 | |||
18 | #include <asm/amigayle.h> | 20 | #include <asm/amigayle.h> |
19 | #include <asm/amipcmcia.h> | 21 | #include <asm/amipcmcia.h> |
20 | 22 | ||
@@ -30,6 +32,7 @@ void pcmcia_reset(void) | |||
30 | while (time_before(jiffies, reset_start_time + 1*HZ/100)); | 32 | while (time_before(jiffies, reset_start_time + 1*HZ/100)); |
31 | b = gayle_reset; | 33 | b = gayle_reset; |
32 | } | 34 | } |
35 | EXPORT_SYMBOL(pcmcia_reset); | ||
33 | 36 | ||
34 | 37 | ||
35 | /* copy a tuple, including tuple header. return nb bytes copied */ | 38 | /* copy a tuple, including tuple header. return nb bytes copied */ |
@@ -61,6 +64,7 @@ int pcmcia_copy_tuple(unsigned char tuple_id, void *tuple, int max_len) | |||
61 | 64 | ||
62 | return 0; | 65 | return 0; |
63 | } | 66 | } |
67 | EXPORT_SYMBOL(pcmcia_copy_tuple); | ||
64 | 68 | ||
65 | void pcmcia_program_voltage(int voltage) | 69 | void pcmcia_program_voltage(int voltage) |
66 | { | 70 | { |
@@ -84,6 +88,7 @@ void pcmcia_program_voltage(int voltage) | |||
84 | gayle.config = cfg_byte; | 88 | gayle.config = cfg_byte; |
85 | 89 | ||
86 | } | 90 | } |
91 | EXPORT_SYMBOL(pcmcia_program_voltage); | ||
87 | 92 | ||
88 | void pcmcia_access_speed(int speed) | 93 | void pcmcia_access_speed(int speed) |
89 | { | 94 | { |
@@ -101,13 +106,17 @@ void pcmcia_access_speed(int speed) | |||
101 | cfg_byte = (cfg_byte & 0xf3) | s; | 106 | cfg_byte = (cfg_byte & 0xf3) | s; |
102 | gayle.config = cfg_byte; | 107 | gayle.config = cfg_byte; |
103 | } | 108 | } |
109 | EXPORT_SYMBOL(pcmcia_access_speed); | ||
104 | 110 | ||
105 | void pcmcia_write_enable(void) | 111 | void pcmcia_write_enable(void) |
106 | { | 112 | { |
107 | gayle.cardstatus = GAYLE_CS_WR|GAYLE_CS_DA; | 113 | gayle.cardstatus = GAYLE_CS_WR|GAYLE_CS_DA; |
108 | } | 114 | } |
115 | EXPORT_SYMBOL(pcmcia_write_enable); | ||
109 | 116 | ||
110 | void pcmcia_write_disable(void) | 117 | void pcmcia_write_disable(void) |
111 | { | 118 | { |
112 | gayle.cardstatus = 0; | 119 | gayle.cardstatus = 0; |
113 | } | 120 | } |
121 | EXPORT_SYMBOL(pcmcia_write_disable); | ||
122 | |||