diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1998-09-19 19:15:08 +0000 |
| commit | 03ba4131783cc9e872f8bb26a03f15bc11f27564 (patch) | |
| tree | 88db8dba75ae06ba3bad08e42c5e52efc162535c /arch/m68k/amiga | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/m68k/amiga')
| -rw-r--r-- | arch/m68k/amiga/config.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/arch/m68k/amiga/config.c b/arch/m68k/amiga/config.c index 3c5dff56d..9483c97b3 100644 --- a/arch/m68k/amiga/config.c +++ b/arch/m68k/amiga/config.c @@ -20,6 +20,7 @@ #include <linux/tty.h> #include <linux/console.h> #include <linux/init.h> +#include <linux/zorro.h> #include <asm/bootinfo.h> #include <asm/setup.h> @@ -29,7 +30,7 @@ #include <asm/amigaints.h> #include <asm/irq.h> #include <asm/machdep.h> -#include <linux/zorro.h> +#include <asm/io.h> unsigned long amiga_model; unsigned long amiga_eclock; @@ -421,10 +422,6 @@ __initfunc(void config_amiga(void)) */ if (AMIGAHW_PRESENT(MAGIC_REKICK)) *(unsigned char *)ZTWO_VADDR(0xde0002) |= 0x80; - -#ifdef CONFIG_ZORRO - zorro_init(); -#endif } static unsigned short jiffy_ticks; @@ -689,8 +686,8 @@ static NORET_TYPE void amiga_reset( void ) static void amiga_reset (void) { - unsigned long jmp_addr040 = VTOP(&&jmp_addr_label040); - unsigned long jmp_addr = VTOP(&&jmp_addr_label); + unsigned long jmp_addr040 = virt_to_phys(&&jmp_addr_label040); + unsigned long jmp_addr = virt_to_phys(&&jmp_addr_label); cli(); if (CPU_IS_040_OR_060) @@ -785,7 +782,7 @@ static void amiga_savekmsg_init(void) savekmsg = (struct savekmsg *)amiga_chip_alloc(SAVEKMSG_MAXMEM); savekmsg->magic1 = SAVEKMSG_MAGIC1; savekmsg->magic2 = SAVEKMSG_MAGIC2; - savekmsg->magicptr = VTOP(savekmsg); + savekmsg->magicptr = virt_to_phys(savekmsg); savekmsg->size = 0; } |