Module Name: src
Committed By: maxv
Date: Sat Sep 22 12:26:27 UTC 2018
Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL GENERIC_ISDN
src/sys/conf: files
src/sys/dev/pci: files.pci
Removed Files:
src/sys/dev/pci: ifpci2.c
Log Message:
Remove the "ifritz" driver (no man page). It is part of ISDN, which we are
retiring.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.453 -r1.454 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/i386/conf/GENERIC_ISDN
cvs rdiff -u -r1.1210 -r1.1211 src/sys/conf/files
cvs rdiff -u -r1.404 -r1.405 src/sys/dev/pci/files.pci
cvs rdiff -u -r1.22 -r0 src/sys/dev/pci/ifpci2.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.103 src/sys/arch/amd64/conf/ALL:1.104
--- src/sys/arch/amd64/conf/ALL:1.103 Sat Sep 22 12:19:11 2018
+++ src/sys/arch/amd64/conf/ALL Sat Sep 22 12:26:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.103 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: ALL,v 1.104 2018/09/22 12:26:27 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/amd64/conf/std.amd64"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.103 $"
+#ident "ALL-$Revision: 1.104 $"
maxusers 64 # estimated number of users
@@ -1756,9 +1756,6 @@ isic* at pci?
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI V2 card
-ifritz* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.453 src/sys/arch/i386/conf/ALL:1.454
--- src/sys/arch/i386/conf/ALL:1.453 Sat Sep 22 12:19:11 2018
+++ src/sys/arch/i386/conf/ALL Sat Sep 22 12:26:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.453 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: ALL,v 1.454 2018/09/22 12:26:27 maxv Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@ include "arch/i386/conf/std.i386"
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.453 $"
+#ident "ALL-$Revision: 1.454 $"
maxusers 64 # estimated number of users
@@ -1902,9 +1902,6 @@ isic* at pci?
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI V2 card
-ifritz* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
Index: src/sys/arch/i386/conf/GENERIC_ISDN
diff -u src/sys/arch/i386/conf/GENERIC_ISDN:1.18 src/sys/arch/i386/conf/GENERIC_ISDN:1.19
--- src/sys/arch/i386/conf/GENERIC_ISDN:1.18 Sat Sep 22 12:19:11 2018
+++ src/sys/arch/i386/conf/GENERIC_ISDN Sat Sep 22 12:26:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_ISDN,v 1.18 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: GENERIC_ISDN,v 1.19 2018/09/22 12:26:27 maxv Exp $
#
# GENERIC kernel with all supported ISDN devices and drivers
@@ -54,9 +54,6 @@ isic* at pci?
# Winbond W6692
iwic* at pci?
-# AVM Fritz!PCI V2 card
-ifritz* at pci?
-
#
#---------------------------------------------------------------------
# Supported PCMCIA cards:
Index: src/sys/conf/files
diff -u src/sys/conf/files:1.1210 src/sys/conf/files:1.1211
--- src/sys/conf/files:1.1210 Sat Sep 22 12:19:11 2018
+++ src/sys/conf/files Sat Sep 22 12:26:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.1210 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: files,v 1.1211 2018/09/22 12:26:27 maxv Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
version 20171118
@@ -1377,8 +1377,8 @@ file dev/ic/isac.c nisac needs-flag
device isic: isdndev, passive_isdn, nisac
file dev/ic/isic.c isic
-file dev/ic/isic_l1.c isic|ifritz
-file dev/ic/isic_l1fsm.c isic|ifritz
+file dev/ic/isic_l1.c isic
+file dev/ic/isic_l1fsm.c isic
file dev/ic/hscx.c isic
file dev/ic/isic_bchan.c isic
Index: src/sys/dev/pci/files.pci
diff -u src/sys/dev/pci/files.pci:1.404 src/sys/dev/pci/files.pci:1.405
--- src/sys/dev/pci/files.pci:1.404 Sat Sep 22 12:19:11 2018
+++ src/sys/dev/pci/files.pci Sat Sep 22 12:26:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: files.pci,v 1.404 2018/09/22 12:19:11 maxv Exp $
+# $NetBSD: files.pci,v 1.405 2018/09/22 12:26:27 maxv Exp $
#
# Config file and device description for machine-independent PCI code.
# Included by ports that need it. Requires that the SCSI files be
@@ -813,10 +813,6 @@ file dev/pci/isic_pci.c isic_pci
file dev/pci/isic_pci_elsa_qs1p.c isic_pci
-device ifritz: isdndev, passive_isdn, nisacsx
-attach ifritz at pci
-file dev/pci/ifpci2.c ifritz
-
# Winbond W6692
device iwic: isdndev, passive_isdn
attach iwic at pci with iwic_pci
