aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-m68k
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@kernel.org>2008-07-17 15:16:23 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-20 20:24:39 -0400
commit0795dbcc4c4c93a929463957993c04cf5fec346c (patch)
tree394d446ba697bda0a5f52f5d730c820fdfa905d8 /include/asm-m68k
parent880e5e212ec5ab12411e40c78bd5ac501e9caeed (diff)
m68k/amiga/: possible cleanups
This patch contains the following possible cleanups: - amiints.c: add a proper prototype for amiga_init_IRQ() in include/asm-m68k/amigaints.h - make the following needlessly global code static: - config.c: amiga_model - config.c: amiga_psfreq - config.c: amiga_serial_console_write() - #if 0 the following unused functions: - config.c: amiga_serial_puts() - config.c: amiga_serial_console_wait_key() - config.c: amiga_serial_gets() - remove the following unused variable: - config.c: amiga_masterclock Signed-off-by: Adrian Bunk <bunk@kernel.org> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-m68k')
-rw-r--r--include/asm-m68k/amigahw.h4
-rw-r--r--include/asm-m68k/amigaints.h2
2 files changed, 2 insertions, 4 deletions
diff --git a/include/asm-m68k/amigahw.h b/include/asm-m68k/amigahw.h
index a16fe4e5a28a..5ca5dd951a4a 100644
--- a/include/asm-m68k/amigahw.h
+++ b/include/asm-m68k/amigahw.h
@@ -22,8 +22,6 @@
22 * Different Amiga models 22 * Different Amiga models
23 */ 23 */
24 24
25extern unsigned long amiga_model;
26
27#define AMI_UNKNOWN (0) 25#define AMI_UNKNOWN (0)
28#define AMI_500 (1) 26#define AMI_500 (1)
29#define AMI_500PLUS (2) 27#define AMI_500PLUS (2)
@@ -59,11 +57,9 @@ extern unsigned long amiga_chipset;
59 */ 57 */
60 58
61extern unsigned long amiga_eclock; /* 700 kHz E Peripheral Clock */ 59extern unsigned long amiga_eclock; /* 700 kHz E Peripheral Clock */
62extern unsigned long amiga_masterclock; /* 28 MHz Master Clock */
63extern unsigned long amiga_colorclock; /* 3.5 MHz Color Clock */ 60extern unsigned long amiga_colorclock; /* 3.5 MHz Color Clock */
64extern unsigned long amiga_chip_size; /* Chip RAM Size (bytes) */ 61extern unsigned long amiga_chip_size; /* Chip RAM Size (bytes) */
65extern unsigned char amiga_vblank; /* VBLANK Frequency */ 62extern unsigned char amiga_vblank; /* VBLANK Frequency */
66extern unsigned char amiga_psfreq; /* Power Supply Frequency */
67 63
68 64
69#define AMIGAHW_DECLARE(name) unsigned name : 1 65#define AMIGAHW_DECLARE(name) unsigned name : 1
diff --git a/include/asm-m68k/amigaints.h b/include/asm-m68k/amigaints.h
index 7c8713468fd2..b1bcdb835ab9 100644
--- a/include/asm-m68k/amigaints.h
+++ b/include/asm-m68k/amigaints.h
@@ -98,6 +98,8 @@
98#define CIA_ICR_ALL 0x1f 98#define CIA_ICR_ALL 0x1f
99#define CIA_ICR_SETCLR 0x80 99#define CIA_ICR_SETCLR 0x80
100 100
101extern void amiga_init_IRQ(void);
102
101/* to access the interrupt control registers of CIA's use only 103/* to access the interrupt control registers of CIA's use only
102** these functions, they behave exactly like the amiga os routines 104** these functions, they behave exactly like the amiga os routines
103*/ 105*/