diff options
author | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-11-13 04:44:24 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2011-12-10 13:52:49 -0500 |
commit | 125298d2daf7c9005d5bc26313a037b798c8de70 (patch) | |
tree | 4615414e04ddb145cf357d5f4ee728355a7a2c6c /arch/m68k | |
parent | 1d9532b3fa7f903bfcf96acc917111db491ee50d (diff) |
m68k/atari: Move declaration of atari_SCC_reset_done to header file
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/atari/ataints.c | 2 | ||||
-rw-r--r-- | arch/m68k/atari/debug.c | 1 | ||||
-rw-r--r-- | arch/m68k/include/asm/atarihw.h | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/arch/m68k/atari/ataints.c b/arch/m68k/atari/ataints.c index 6d196dadfdbc..8048e1b7e552 100644 --- a/arch/m68k/atari/ataints.c +++ b/arch/m68k/atari/ataints.c | |||
@@ -82,8 +82,6 @@ __ALIGN_STR "\n\t" | |||
82 | 82 | ||
83 | extern void atari_microwire_cmd(int cmd); | 83 | extern void atari_microwire_cmd(int cmd); |
84 | 84 | ||
85 | extern int atari_SCC_reset_done; | ||
86 | |||
87 | static unsigned int atari_irq_startup(struct irq_data *data) | 85 | static unsigned int atari_irq_startup(struct irq_data *data) |
88 | { | 86 | { |
89 | unsigned int irq = data->irq; | 87 | unsigned int irq = data->irq; |
diff --git a/arch/m68k/atari/debug.c b/arch/m68k/atari/debug.c index 5a484247e493..a547ba9683d1 100644 --- a/arch/m68k/atari/debug.c +++ b/arch/m68k/atari/debug.c | |||
@@ -202,7 +202,6 @@ static void __init atari_init_mfp_port(int cflag) | |||
202 | 202 | ||
203 | static void __init atari_init_scc_port(int cflag) | 203 | static void __init atari_init_scc_port(int cflag) |
204 | { | 204 | { |
205 | extern int atari_SCC_reset_done; | ||
206 | static int clksrc_table[9] = | 205 | static int clksrc_table[9] = |
207 | /* reg 11: 0x50 = BRG, 0x00 = RTxC, 0x28 = TRxC */ | 206 | /* reg 11: 0x50 = BRG, 0x00 = RTxC, 0x28 = TRxC */ |
208 | { 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 }; | 207 | { 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 }; |
diff --git a/arch/m68k/include/asm/atarihw.h b/arch/m68k/include/asm/atarihw.h index 0392b28656ab..c0cb36350775 100644 --- a/arch/m68k/include/asm/atarihw.h +++ b/arch/m68k/include/asm/atarihw.h | |||
@@ -30,6 +30,8 @@ extern u_long atari_switches; | |||
30 | extern int atari_rtc_year_offset; | 30 | extern int atari_rtc_year_offset; |
31 | extern int atari_dont_touch_floppy_select; | 31 | extern int atari_dont_touch_floppy_select; |
32 | 32 | ||
33 | extern int atari_SCC_reset_done; | ||
34 | |||
33 | /* convenience macros for testing machine type */ | 35 | /* convenience macros for testing machine type */ |
34 | #define MACH_IS_ST ((atari_mch_cookie >> 16) == ATARI_MCH_ST) | 36 | #define MACH_IS_ST ((atari_mch_cookie >> 16) == ATARI_MCH_ST) |
35 | #define MACH_IS_STE ((atari_mch_cookie >> 16) == ATARI_MCH_STE && \ | 37 | #define MACH_IS_STE ((atari_mch_cookie >> 16) == ATARI_MCH_STE && \ |