diff --git a/sys/arch/amiga/conf/GENERIC.in b/sys/arch/amiga/conf/GENERIC.in index 7f25b3797b79..4e66f7a3662b 100644 --- a/sys/arch/amiga/conf/GENERIC.in +++ b/sys/arch/amiga/conf/GENERIC.in @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC.in,v 1.52 2006/03/28 20:58:39 pavel Exp $ +# $NetBSD: GENERIC.in,v 1.53 2006/06/29 14:00:55 liamjfoy Exp $ # # GENERIC machine description file # @@ -56,7 +56,7 @@ include "arch/amiga/conf/std.amiga" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.52 $" +#ident "GENERIC-$Revision: 1.53 $" m4_ifdef(`INSTALL_CONFIGURATION', `m4_dnl makeoptions COPTS="-Os" @@ -578,6 +578,7 @@ pseudo-device tun # network tunnel line discipline pseudo-device tap # virtual Ethernet #pseudo-device gre # generic L3 over IP tunnel pseudo-device bpfilter # Berkeley packet filter +#pseudo-device carp # Common Address Redundancy Protocol pseudo-device ipfilter # IP Filter package pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) #pseudo-device faith # IPv[46] tcp relay translation i/f diff --git a/sys/arch/atari/conf/GENERIC.in b/sys/arch/atari/conf/GENERIC.in index 1772bdfa2dc1..0de131b20673 100644 --- a/sys/arch/atari/conf/GENERIC.in +++ b/sys/arch/atari/conf/GENERIC.in @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC.in,v 1.61 2006/03/28 20:58:39 pavel Exp $ +# $NetBSD: GENERIC.in,v 1.62 2006/06/29 14:00:55 liamjfoy Exp $ # # Generic atari # @@ -251,6 +251,7 @@ pseudo-device md 3 # Boot memory disk #ifndef INSTALL_KERNEL pseudo-device bpfilter # berkeley packet filters +#pseudo-device carp # Common Address Redundancy Protocol pseudo-device tun # network tunnel pseudo-device tap # virtual Ethernet #pseudo-device gre # generic L3 over IP tunnel diff --git a/sys/arch/sparc64/conf/GENERIC32 b/sys/arch/sparc64/conf/GENERIC32 index e2f0cc8f5591..046861ecfd79 100644 --- a/sys/arch/sparc64/conf/GENERIC32 +++ b/sys/arch/sparc64/conf/GENERIC32 @@ -1,10 +1,10 @@ -# $NetBSD: GENERIC32,v 1.138 2006/06/05 05:14:38 gdamore Exp $ +# $NetBSD: GENERIC32,v 1.139 2006/06/29 14:00:55 liamjfoy Exp $ include "arch/sparc64/conf/std.sparc64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.138 $" +#ident "GENERIC-$Revision: 1.139 $" maxusers 64 @@ -660,6 +660,9 @@ pseudo-device tap # virtual Ethernet ## interface that allows selective examining of incoming packets. pseudo-device bpfilter +# Common Address Redundancy Protocol +#pseudo-device carp + ## IEEE 802.1q encapsulation pseudo-device vlan