diff options
-rw-r--r-- | sys/conf/files.pc98 | 4 | ||||
-rw-r--r-- | sys/pc98/conf/GENERIC | 5 | ||||
-rw-r--r-- | sys/pc98/conf/GENERIC98 | 5 | ||||
-rw-r--r-- | sys/pc98/conf/files.pc98 | 4 | ||||
-rw-r--r-- | sys/pc98/i386/userconfig.c | 2 | ||||
-rw-r--r-- | sys/pc98/pc98/isa_compat.h | 10 |
6 files changed, 0 insertions, 30 deletions
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98 index 49f415e..c41045c 100644 --- a/sys/conf/files.pc98 +++ b/sys/conf/files.pc98 @@ -216,8 +216,6 @@ i386/isa/if_rdp.c optional rdp i386/isa/if_sr.c optional sr i386/isa/if_wi.c optional wi card i386/isa/if_wl.c optional wl -i386/isa/if_ze.c optional ze -i386/isa/if_zp.c optional zp i386/isa/intr_machdep.c standard i386/isa/ipl_funcs.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<" @@ -238,8 +236,6 @@ pc98/pc98/pc98kbd.c optional pckbd pc98/pc98/pcaudio.c optional pca i386/isa/pcf.c optional pcf i386/isa/pcibus.c optional pci -i386/isa/pcicx.c optional ze -i386/isa/pcicx.c optional zp i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt i386/isa/pcvt/pcvt_kbd.c optional vt diff --git a/sys/pc98/conf/GENERIC b/sys/pc98/conf/GENERIC index 014a11c..9247333 100644 --- a/sys/pc98/conf/GENERIC +++ b/sys/pc98/conf/GENERIC @@ -253,11 +253,6 @@ device lnc0 at isa? port 0x03d0 irq 6 options FE_8BIT_SUPPORT # LAC-98 support -# PCCARD NIC drivers. -# ze and zp take over the pcic and cannot coexist with generic pccard -# support, nor the ed and ep drivers they replace. -#device zp0 at isa? port 0x00d0 irq 10 iomem 0xe0000 - #controller snd0 #device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3 #device sbxvi0 at isa? drq 3 diff --git a/sys/pc98/conf/GENERIC98 b/sys/pc98/conf/GENERIC98 index 014a11c..9247333 100644 --- a/sys/pc98/conf/GENERIC98 +++ b/sys/pc98/conf/GENERIC98 @@ -253,11 +253,6 @@ device lnc0 at isa? port 0x03d0 irq 6 options FE_8BIT_SUPPORT # LAC-98 support -# PCCARD NIC drivers. -# ze and zp take over the pcic and cannot coexist with generic pccard -# support, nor the ed and ep drivers they replace. -#device zp0 at isa? port 0x00d0 irq 10 iomem 0xe0000 - #controller snd0 #device sb0 at isa? port 0x20d2 irq 10 conflicts drq 3 #device sbxvi0 at isa? drq 3 diff --git a/sys/pc98/conf/files.pc98 b/sys/pc98/conf/files.pc98 index 49f415e..c41045c 100644 --- a/sys/pc98/conf/files.pc98 +++ b/sys/pc98/conf/files.pc98 @@ -216,8 +216,6 @@ i386/isa/if_rdp.c optional rdp i386/isa/if_sr.c optional sr i386/isa/if_wi.c optional wi card i386/isa/if_wl.c optional wl -i386/isa/if_ze.c optional ze -i386/isa/if_zp.c optional zp i386/isa/intr_machdep.c standard i386/isa/ipl_funcs.c standard \ compile-with "${CC} -c ${CFLAGS} ${DEFINED_PROF:S/^$/-fomit-frame-pointer/} $<" @@ -238,8 +236,6 @@ pc98/pc98/pc98kbd.c optional pckbd pc98/pc98/pcaudio.c optional pca i386/isa/pcf.c optional pcf i386/isa/pcibus.c optional pci -i386/isa/pcicx.c optional ze -i386/isa/pcicx.c optional zp i386/isa/pcvt/pcvt_drv.c optional vt i386/isa/pcvt/pcvt_ext.c optional vt i386/isa/pcvt/pcvt_kbd.c optional vt diff --git a/sys/pc98/i386/userconfig.c b/sys/pc98/i386/userconfig.c index 9d0370f7..76094e0 100644 --- a/sys/pc98/i386/userconfig.c +++ b/sys/pc98/i386/userconfig.c @@ -409,8 +409,6 @@ static DEV_INFO device_info[] = { {"tx", "SMC 9432TX Ethernet adapters", 0, CLS_NETWORK}, {"vx", "3COM 3C590/3C595 Ethernet adapters", 0, CLS_NETWORK}, {"xe", "Xircom PC Card Ethernet adapter", 0, CLS_NETWORK}, -{"ze", "IBM/National Semiconductor PCMCIA Ethernet adapter",0, CLS_NETWORK}, -{"zp", "3COM PCMCIA Etherlink III Ethernet adapter", 0, CLS_NETWORK}, {"dc", "DEC/Intel 21143 or clone Ethernet adapter", FLG_FIXED, CLS_NETWORK}, {"de", "DEC DC21040 Ethernet adapter", FLG_FIXED, CLS_NETWORK}, {"fpa", "DEC DEFPA PCI FDDI adapter", FLG_FIXED, CLS_NETWORK}, diff --git a/sys/pc98/pc98/isa_compat.h b/sys/pc98/pc98/isa_compat.h index 228b039..3de0938 100644 --- a/sys/pc98/pc98/isa_compat.h +++ b/sys/pc98/pc98/isa_compat.h @@ -42,8 +42,6 @@ #include "rdp.h" #include "sr.h" #include "wl.h" -#include "ze.h" -#include "zp.h" #include "oltr.h" #include "pcm.h" #include "pas.h" @@ -110,8 +108,6 @@ extern struct isa_driver lncdriver; extern struct isa_driver rdpdriver; extern struct isa_driver srdriver; extern struct isa_driver wldriver; -extern struct isa_driver zedriver; -extern struct isa_driver zpdriver; extern struct isa_driver oltrdriver; extern struct isa_driver pasdriver; extern struct isa_driver sbdriver; @@ -262,12 +258,6 @@ static struct old_isa_driver old_drivers[] = { #if NLNC > 0 { INTR_TYPE_NET, &lncdriver }, #endif -#if NZE > 0 - { INTR_TYPE_NET, &zedriver }, -#endif -#if NZP > 0 - { INTR_TYPE_NET, &zpdriver }, -#endif #if NCS > 0 { INTR_TYPE_NET, &csdriver }, #endif |