From e3178a06e5ea23fe30b6d4a57fd8f2707a0464a4 Mon Sep 17 00:00:00 2001
From: "Jordan K. Hubbard" <jkh@FreeBSD.org>
Date: Tue, 17 May 1994 22:30:41 +0000
Subject: [PATCH] Fold in the changes to support IP multicasting, from Jim Lowe
 et al.

---
 sys/conf/NOTES      | 5 ++++-
 sys/i386/conf/LINT  | 5 ++++-
 sys/i386/conf/NOTES | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index d9745467e35..48c2d4563a8 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.67 1994/05/17 14:15:11 jkh Exp $
+#	$Id: LINT,v 1.68 1994/05/17 14:18:13 jkh Exp $
 #
 
 machine		"i386"
@@ -65,6 +65,9 @@ options		USER_LDT		#allow user-level control of i386 ldt
 # See /sys/i386/doc/sound.doc for information about EXCLUDE options for
 #  the sound drivers.
 
+options		MULTICAST		# Multicast code
+options		MROUTING		# Multicast routing
+
 #
 # options that are in sys/conf/files
 #
diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT
index d9745467e35..48c2d4563a8 100644
--- a/sys/i386/conf/LINT
+++ b/sys/i386/conf/LINT
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.67 1994/05/17 14:15:11 jkh Exp $
+#	$Id: LINT,v 1.68 1994/05/17 14:18:13 jkh Exp $
 #
 
 machine		"i386"
@@ -65,6 +65,9 @@ options		USER_LDT		#allow user-level control of i386 ldt
 # See /sys/i386/doc/sound.doc for information about EXCLUDE options for
 #  the sound drivers.
 
+options		MULTICAST		# Multicast code
+options		MROUTING		# Multicast routing
+
 #
 # options that are in sys/conf/files
 #
diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES
index d9745467e35..48c2d4563a8 100644
--- a/sys/i386/conf/NOTES
+++ b/sys/i386/conf/NOTES
@@ -4,7 +4,7 @@
 #
 #	This kernel is NOT MEANT to be runnable!
 #
-#	$Id: LINT,v 1.67 1994/05/17 14:15:11 jkh Exp $
+#	$Id: LINT,v 1.68 1994/05/17 14:18:13 jkh Exp $
 #
 
 machine		"i386"
@@ -65,6 +65,9 @@ options		USER_LDT		#allow user-level control of i386 ldt
 # See /sys/i386/doc/sound.doc for information about EXCLUDE options for
 #  the sound drivers.
 
+options		MULTICAST		# Multicast code
+options		MROUTING		# Multicast routing
+
 #
 # options that are in sys/conf/files
 #