diff options
Diffstat (limited to 'include/asm-m68k')
-rw-r--r-- | include/asm-m68k/amigahw.h | 4 | ||||
-rw-r--r-- | include/asm-m68k/amigaints.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/apollodma.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/dvma.h | 4 | ||||
-rw-r--r-- | include/asm-m68k/fpu.h | 10 | ||||
-rw-r--r-- | include/asm-m68k/irq.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/mac_baboon.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/mac_via.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/machines.h | 4 | ||||
-rw-r--r-- | include/asm-m68k/macintosh.h | 5 | ||||
-rw-r--r-- | include/asm-m68k/md.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/openprom.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/oplib.h | 3 | ||||
-rw-r--r-- | include/asm-m68k/sbus.h | 5 | ||||
-rw-r--r-- | include/asm-m68k/sun3-head.h | 1 | ||||
-rw-r--r-- | include/asm-m68k/tlbflush.h | 8 |
16 files changed, 17 insertions, 39 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 | ||
25 | extern 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 | ||
61 | extern unsigned long amiga_eclock; /* 700 kHz E Peripheral Clock */ | 59 | extern unsigned long amiga_eclock; /* 700 kHz E Peripheral Clock */ |
62 | extern unsigned long amiga_masterclock; /* 28 MHz Master Clock */ | ||
63 | extern unsigned long amiga_colorclock; /* 3.5 MHz Color Clock */ | 60 | extern unsigned long amiga_colorclock; /* 3.5 MHz Color Clock */ |
64 | extern unsigned long amiga_chip_size; /* Chip RAM Size (bytes) */ | 61 | extern unsigned long amiga_chip_size; /* Chip RAM Size (bytes) */ |
65 | extern unsigned char amiga_vblank; /* VBLANK Frequency */ | 62 | extern unsigned char amiga_vblank; /* VBLANK Frequency */ |
66 | extern 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 | ||
101 | extern 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 | */ |
diff --git a/include/asm-m68k/apollodma.h b/include/asm-m68k/apollodma.h index 6821e3ba32e9..954adc851adb 100644 --- a/include/asm-m68k/apollodma.h +++ b/include/asm-m68k/apollodma.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: dma.h,v 1.7 1992/12/14 00:29:34 root Exp root $ | 1 | /* |
2 | * linux/include/asm/dma.h: Defines for using and allocating dma channels. | 2 | * linux/include/asm/dma.h: Defines for using and allocating dma channels. |
3 | * Written by Hennus Bergman, 1992. | 3 | * Written by Hennus Bergman, 1992. |
4 | * High DMA channel support & info by Hannu Savolainen | 4 | * High DMA channel support & info by Hannu Savolainen |
diff --git a/include/asm-m68k/dvma.h b/include/asm-m68k/dvma.h index e1112de5a5e3..4fff408d0150 100644 --- a/include/asm-m68k/dvma.h +++ b/include/asm-m68k/dvma.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: dvma.h,v 1.4 1999/03/27 20:23:41 tsbogend Exp $ | 1 | /* |
2 | * include/asm-m68k/dma.h | 2 | * include/asm-m68k/dma.h |
3 | * | 3 | * |
4 | * Copyright 1995 (C) David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright 1995 (C) David S. Miller (davem@caip.rutgers.edu) |
@@ -63,8 +63,6 @@ static inline int dvma_map_cpu(unsigned long kaddr, unsigned long vaddr, | |||
63 | return 0; | 63 | return 0; |
64 | } | 64 | } |
65 | 65 | ||
66 | extern unsigned long dvma_page(unsigned long kaddr, unsigned long vaddr); | ||
67 | |||
68 | #else /* Sun3x */ | 66 | #else /* Sun3x */ |
69 | 67 | ||
70 | /* sun3x dvma page support */ | 68 | /* sun3x dvma page support */ |
diff --git a/include/asm-m68k/fpu.h b/include/asm-m68k/fpu.h index 59701d7b4e78..ffb6b8cfc6d5 100644 --- a/include/asm-m68k/fpu.h +++ b/include/asm-m68k/fpu.h | |||
@@ -7,15 +7,15 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #if defined(CONFIG_M68020) || defined(CONFIG_M68030) | 9 | #if defined(CONFIG_M68020) || defined(CONFIG_M68030) |
10 | #define FPSTATESIZE (216/sizeof(unsigned char)) | 10 | #define FPSTATESIZE (216) |
11 | #elif defined(CONFIG_M68040) | 11 | #elif defined(CONFIG_M68040) |
12 | #define FPSTATESIZE (96/sizeof(unsigned char)) | 12 | #define FPSTATESIZE (96) |
13 | #elif defined(CONFIG_M68KFPU_EMU) | 13 | #elif defined(CONFIG_M68KFPU_EMU) |
14 | #define FPSTATESIZE (28/sizeof(unsigned char)) | 14 | #define FPSTATESIZE (28) |
15 | #elif defined(CONFIG_M68060) | 15 | #elif defined(CONFIG_M68060) |
16 | #define FPSTATESIZE (12/sizeof(unsigned char)) | 16 | #define FPSTATESIZE (12) |
17 | #else | 17 | #else |
18 | #define FPSTATESIZE error no_cpu_type_configured | 18 | #define FPSTATESIZE (0) |
19 | #endif | 19 | #endif |
20 | 20 | ||
21 | #endif /* __M68K_FPU_H */ | 21 | #endif /* __M68K_FPU_H */ |
diff --git a/include/asm-m68k/irq.h b/include/asm-m68k/irq.h index eb29a5260591..226bfc0f21b1 100644 --- a/include/asm-m68k/irq.h +++ b/include/asm-m68k/irq.h | |||
@@ -24,7 +24,7 @@ | |||
24 | #elif defined(CONFIG_HP300) | 24 | #elif defined(CONFIG_HP300) |
25 | #define NR_IRQS 8 | 25 | #define NR_IRQS 8 |
26 | #else | 26 | #else |
27 | #error unknown nr of irqs | 27 | #define NR_IRQS 0 |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | /* | 30 | /* |
diff --git a/include/asm-m68k/mac_baboon.h b/include/asm-m68k/mac_baboon.h index e87850830be8..c2a042b8c349 100644 --- a/include/asm-m68k/mac_baboon.h +++ b/include/asm-m68k/mac_baboon.h | |||
@@ -29,6 +29,4 @@ struct baboon { | |||
29 | */ | 29 | */ |
30 | }; | 30 | }; |
31 | 31 | ||
32 | extern volatile struct baboon *baboon; | ||
33 | |||
34 | #endif /* __ASSEMBLY **/ | 32 | #endif /* __ASSEMBLY **/ |
diff --git a/include/asm-m68k/mac_via.h b/include/asm-m68k/mac_via.h index 59b758cd16ad..39afb438b656 100644 --- a/include/asm-m68k/mac_via.h +++ b/include/asm-m68k/mac_via.h | |||
@@ -253,7 +253,6 @@ | |||
253 | 253 | ||
254 | extern volatile __u8 *via1,*via2; | 254 | extern volatile __u8 *via1,*via2; |
255 | extern int rbv_present,via_alt_mapping; | 255 | extern int rbv_present,via_alt_mapping; |
256 | extern __u8 rbv_clear; | ||
257 | 256 | ||
258 | static inline int rbv_set_video_bpp(int bpp) | 257 | static inline int rbv_set_video_bpp(int bpp) |
259 | { | 258 | { |
diff --git a/include/asm-m68k/machines.h b/include/asm-m68k/machines.h index da6015a90f24..be667e84f01b 100644 --- a/include/asm-m68k/machines.h +++ b/include/asm-m68k/machines.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: machines.h,v 1.4 1995/11/25 02:31:58 davem Exp $ | 1 | /* |
2 | * machines.h: Defines for taking apart the machine type value in the | 2 | * machines.h: Defines for taking apart the machine type value in the |
3 | * idprom and determining the kind of machine we are on. | 3 | * idprom and determining the kind of machine we are on. |
4 | * | 4 | * |
@@ -21,8 +21,6 @@ struct Sun_Machine_Models { | |||
21 | //#define NUM_SUN_MACHINES 23 | 21 | //#define NUM_SUN_MACHINES 23 |
22 | #define NUM_SUN_MACHINES 8 | 22 | #define NUM_SUN_MACHINES 8 |
23 | 23 | ||
24 | extern struct Sun_Machine_Models Sun_Machines[NUM_SUN_MACHINES]; | ||
25 | |||
26 | /* The machine type in the idprom area looks like this: | 24 | /* The machine type in the idprom area looks like this: |
27 | * | 25 | * |
28 | * --------------- | 26 | * --------------- |
diff --git a/include/asm-m68k/macintosh.h b/include/asm-m68k/macintosh.h index 28b0f49ee521..05309f7e3d06 100644 --- a/include/asm-m68k/macintosh.h +++ b/include/asm-m68k/macintosh.h | |||
@@ -12,8 +12,6 @@ extern void mac_reset(void); | |||
12 | extern void mac_poweroff(void); | 12 | extern void mac_poweroff(void); |
13 | extern void mac_init_IRQ(void); | 13 | extern void mac_init_IRQ(void); |
14 | extern int mac_irq_pending(unsigned int); | 14 | extern int mac_irq_pending(unsigned int); |
15 | extern void mac_identify(void); | ||
16 | extern void mac_report_hardware(void); | ||
17 | 15 | ||
18 | /* | 16 | /* |
19 | * Floppy driver magic hook - probably shouldnt be here | 17 | * Floppy driver magic hook - probably shouldnt be here |
@@ -21,9 +19,6 @@ extern void mac_report_hardware(void); | |||
21 | 19 | ||
22 | extern void via1_set_head(int); | 20 | extern void via1_set_head(int); |
23 | 21 | ||
24 | extern void parse_booter(char *ptr); | ||
25 | extern void print_booter(char *ptr); | ||
26 | |||
27 | /* | 22 | /* |
28 | * Macintosh Table | 23 | * Macintosh Table |
29 | */ | 24 | */ |
diff --git a/include/asm-m68k/md.h b/include/asm-m68k/md.h index 467ea08383e4..d2f78f226f3d 100644 --- a/include/asm-m68k/md.h +++ b/include/asm-m68k/md.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: md.h,v 1.1 1997/12/15 15:12:04 jj Exp $ | 1 | /* |
2 | * md.h: High speed xor_block operation for RAID4/5 | 2 | * md.h: High speed xor_block operation for RAID4/5 |
3 | * | 3 | * |
4 | */ | 4 | */ |
diff --git a/include/asm-m68k/openprom.h b/include/asm-m68k/openprom.h index 869ab9176e9f..d33cdadf78e1 100644 --- a/include/asm-m68k/openprom.h +++ b/include/asm-m68k/openprom.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: openprom.h,v 1.19 1996/09/25 03:51:08 davem Exp $ */ | ||
2 | #ifndef __SPARC_OPENPROM_H | 1 | #ifndef __SPARC_OPENPROM_H |
3 | #define __SPARC_OPENPROM_H | 2 | #define __SPARC_OPENPROM_H |
4 | 3 | ||
diff --git a/include/asm-m68k/oplib.h b/include/asm-m68k/oplib.h index 06caa2d08451..f082d03336bd 100644 --- a/include/asm-m68k/oplib.h +++ b/include/asm-m68k/oplib.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: oplib.h,v 1.12 1996/10/31 06:29:13 davem Exp $ | 1 | /* |
2 | * oplib.h: Describes the interface and available routines in the | 2 | * oplib.h: Describes the interface and available routines in the |
3 | * Linux Prom library. | 3 | * Linux Prom library. |
4 | * | 4 | * |
@@ -19,7 +19,6 @@ enum prom_major_version { | |||
19 | PROM_V2, /* sun4c and early sun4m V2 prom */ | 19 | PROM_V2, /* sun4c and early sun4m V2 prom */ |
20 | PROM_V3, /* sun4m and later, up to sun4d/sun4e machines V3 */ | 20 | PROM_V3, /* sun4m and later, up to sun4d/sun4e machines V3 */ |
21 | PROM_P1275, /* IEEE compliant ISA based Sun PROM, only sun4u */ | 21 | PROM_P1275, /* IEEE compliant ISA based Sun PROM, only sun4u */ |
22 | PROM_AP1000, /* actually no prom at all */ | ||
23 | }; | 22 | }; |
24 | 23 | ||
25 | extern enum prom_major_version prom_vers; | 24 | extern enum prom_major_version prom_vers; |
diff --git a/include/asm-m68k/sbus.h b/include/asm-m68k/sbus.h index 3b25c0040aa6..bfe3ba147f2e 100644 --- a/include/asm-m68k/sbus.h +++ b/include/asm-m68k/sbus.h | |||
@@ -12,11 +12,6 @@ struct sbus_dev { | |||
12 | } reg_addrs[1]; | 12 | } reg_addrs[1]; |
13 | }; | 13 | }; |
14 | 14 | ||
15 | extern void *sparc_alloc_io (u32, void *, int, char *, u32, int); | ||
16 | #define sparc_alloc_io(a,b,c,d,e,f) (a) | ||
17 | |||
18 | #define ARCH_SUN4 0 | ||
19 | |||
20 | /* sbus IO functions stolen from include/asm-sparc/io.h for the serial driver */ | 15 | /* sbus IO functions stolen from include/asm-sparc/io.h for the serial driver */ |
21 | /* No SBUS on the Sun3, kludge -- sam */ | 16 | /* No SBUS on the Sun3, kludge -- sam */ |
22 | 17 | ||
diff --git a/include/asm-m68k/sun3-head.h b/include/asm-m68k/sun3-head.h index e74f384e269f..05af2f18b3bd 100644 --- a/include/asm-m68k/sun3-head.h +++ b/include/asm-m68k/sun3-head.h | |||
@@ -1,4 +1,3 @@ | |||
1 | /* $Id: head.h,v 1.32 1996/12/04 00:12:48 ecd Exp $ */ | ||
2 | #ifndef __SUN3_HEAD_H | 1 | #ifndef __SUN3_HEAD_H |
3 | #define __SUN3_HEAD_H | 2 | #define __SUN3_HEAD_H |
4 | 3 | ||
diff --git a/include/asm-m68k/tlbflush.h b/include/asm-m68k/tlbflush.h index 17707ec315e2..acb6bf21a321 100644 --- a/include/asm-m68k/tlbflush.h +++ b/include/asm-m68k/tlbflush.h | |||
@@ -16,7 +16,7 @@ static inline void flush_tlb_kernel_page(void *addr) | |||
16 | ".chip 68k" | 16 | ".chip 68k" |
17 | : : "a" (addr)); | 17 | : : "a" (addr)); |
18 | set_fs(old_fs); | 18 | set_fs(old_fs); |
19 | } else | 19 | } else if (CPU_IS_020_OR_030) |
20 | __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr)); | 20 | __asm__ __volatile__("pflush #4,#4,(%0)" : : "a" (addr)); |
21 | } | 21 | } |
22 | 22 | ||
@@ -29,7 +29,7 @@ static inline void __flush_tlb(void) | |||
29 | __asm__ __volatile__(".chip 68040\n\t" | 29 | __asm__ __volatile__(".chip 68040\n\t" |
30 | "pflushan\n\t" | 30 | "pflushan\n\t" |
31 | ".chip 68k"); | 31 | ".chip 68k"); |
32 | else | 32 | else if (CPU_IS_020_OR_030) |
33 | __asm__ __volatile__("pflush #0,#4"); | 33 | __asm__ __volatile__("pflush #0,#4"); |
34 | } | 34 | } |
35 | 35 | ||
@@ -45,7 +45,7 @@ static inline void __flush_tlb_one(unsigned long addr) | |||
45 | { | 45 | { |
46 | if (CPU_IS_040_OR_060) | 46 | if (CPU_IS_040_OR_060) |
47 | __flush_tlb040_one(addr); | 47 | __flush_tlb040_one(addr); |
48 | else | 48 | else if (CPU_IS_020_OR_030) |
49 | __asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr)); | 49 | __asm__ __volatile__("pflush #0,#4,(%0)" : : "a" (addr)); |
50 | } | 50 | } |
51 | 51 | ||
@@ -60,7 +60,7 @@ static inline void flush_tlb_all(void) | |||
60 | __asm__ __volatile__(".chip 68040\n\t" | 60 | __asm__ __volatile__(".chip 68040\n\t" |
61 | "pflusha\n\t" | 61 | "pflusha\n\t" |
62 | ".chip 68k"); | 62 | ".chip 68k"); |
63 | else | 63 | else if (CPU_IS_020_OR_030) |
64 | __asm__ __volatile__("pflusha"); | 64 | __asm__ __volatile__("pflusha"); |
65 | } | 65 | } |
66 | 66 | ||