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/atari/config.c | |
| parent | 257730f99381dd26e10b832fce4c94cae7ac1176 (diff) | |
- Merge with Linux 2.1.121.
- Bugfixes.
Diffstat (limited to 'arch/m68k/atari/config.c')
| -rw-r--r-- | arch/m68k/atari/config.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index a63e71e08..8db027ab4 100644 --- a/arch/m68k/atari/config.c +++ b/arch/m68k/atari/config.c @@ -39,6 +39,7 @@ #include <asm/system.h> #include <asm/machdep.h> #include <asm/hwtest.h> +#include <asm/io.h> u_long atari_mch_cookie; u_long atari_mch_type = 0; @@ -616,7 +617,7 @@ static void atari_reset (void) : : : "d0" ); if (CPU_IS_040_OR_060) { - unsigned long jmp_addr040 = VTOP(&&jmp_addr_label040); + unsigned long jmp_addr040 = virt_to_phys(&&jmp_addr_label040); if (CPU_IS_060) { /* 68060: clear PCR to turn off superscalar operation */ __asm__ __volatile__ |