patch-2.1.37 linux/arch/m68k/amiga/zorro.c

• Lines: 41
• Date: Mon May 12 10:35:38 1997
• Orig file: v2.1.36/linux/arch/m68k/amiga/zorro.c
• Orig date: Wed Apr 23 19:01:15 1997

diff -u --recursive --new-file v2.1.36/linux/arch/m68k/amiga/zorro.c linux/arch/m68k/amiga/zorro.c
@@ -13,10 +13,11 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
+#include <linux/init.h>
+#include <linux/zorro.h>
 #include <asm/setup.h>
 #include <asm/bitops.h>
 #include <asm/amigahw.h>
-#include <linux/zorro.h>
 
 
 #ifdef CONFIG_ZORRO
@@ -415,10 +416,6 @@
    PROD("MVD 819", MVD_819)
 END
 
-BEGIN_PROD(DELACOMP)
-   PROD("RAM Expansion 2000", DELACOMP_RAM_2000)
-END
-
 BEGIN_PROD(VILLAGE_TRONIC)
    PROD("Domino Graphics Board (RAM)", DOMINO_RAM)
    PROD("Domino Graphics Board (REG)", DOMINO_REG)
@@ -656,7 +653,6 @@
    MANUF("Helfrich", HELFRICH1)
    MANUF("Software Result Enterprises", SW_RESULT_ENTS)
    MANUF("Masoboshi", MASOBOSHI)
-   MANUF("DelaComp", DELACOMP)
    MANUF("Village Tronic", VILLAGE_TRONIC)
    MANUF("Utilities Unlimited", UTILITIES_ULTD)
    MANUF("Amitrix", AMITRIX)
@@ -992,7 +988,7 @@
     *    Initialization
     */
 
-void zorro_init(void)
+__initfunc(void zorro_init(void))
 {
    int i;
    struct ConfigDev *cd;