patch-2.1.120 linux/arch/m68k/amiga/config.c

• Lines: 48
• Date: Wed Sep 2 09:39:18 1998
• Orig file: v2.1.119/linux/arch/m68k/amiga/config.c
• Orig date: Mon Aug 3 12:45:44 1998

diff -u --recursive --new-file v2.1.119/linux/arch/m68k/amiga/config.c linux/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 @@
    */
   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 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 @@
     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;
 }