diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2007-06-05 08:08:48 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2007-06-05 08:08:48 +0000 |
commit | 8f79d391bb54f8c64e2d0cd49200d426e55218d9 (patch) | |
tree | 89718cad19c75f8aeb537ec83f1f60b9c971c18c /sys/conf | |
parent | bd1c67bdf103b46d110ee93c44d61ee4717b2859 (diff) |
IPX is about to go away, remove commented out IPX options in GENERIC and
ipx related files (doesn't compile anyway)
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/GENERIC | 4 | ||||
-rw-r--r-- | sys/conf/files | 13 |
2 files changed, 2 insertions, 15 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 247da8902a4..ea35493473d 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.132 2007/06/02 01:58:17 marco Exp $ +# $OpenBSD: GENERIC,v 1.133 2007/06/05 08:08:46 henning Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -61,8 +61,6 @@ option ALTQ # ALTQ base option INET6 # IPv6 (needs INET) option IPSEC # IPsec #option KEY # PF_KEY (implied by IPSEC) -#option IPX # IPX+SPX -#option IPXIP # IPX tunneling over IP #option NETATALK # AppleTalk option PPP_BSDCOMP # PPP BSD compression option PPP_DEFLATE diff --git a/sys/conf/files b/sys/conf/files index 8d81fd03b97..80b394f1858 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.406 2007/06/01 05:37:14 deraadt Exp $ +# $OpenBSD: files,v 1.407 2007/06/05 08:08:47 henning Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -843,17 +843,6 @@ file netbt/sco_upper.c bluetooth file netnatm/natm_pcb.c natm file netnatm/natm_proto.c natm file netnatm/natm.c natm -file netipx/ipx.c ipx -file netipx/ipx_input.c ipx -file netipx/ipx_ip.c ipx -file netipx/ipx_outputfl.c ipx -file netipx/ipx_pcb.c ipx -file netipx/ipx_proto.c ipx -file netipx/ipx_tun.c ipx -file netipx/ipx_usrreq.c ipx -file netipx/ipx_cksum.c ipx -file netipx/spx_debug.c ipx -file netipx/spx_usrreq.c ipx file nfs/krpc_subr.c nfsclient file nfs/nfs_bio.c nfsclient file nfs/nfs_boot.c nfsclient |