From 8f8953eb3c984f4a840336aa6e50f76aa9d66e55 Mon Sep 17 00:00:00 2001
From: Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org>
Date: Sun, 9 Jan 2000 22:00:27 +0000
Subject: add INET6 into conf/GENERIC. add pseudo-devices for IPv6 into
 arch/*/conf/GENERIC. nuke arch/*/conf/GENERIC.v6.

---
 sys/arch/powerpc/conf/GENERIC    | 5 ++++-
 sys/arch/powerpc/conf/GENERIC.v6 | 7 -------
 2 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 100644 sys/arch/powerpc/conf/GENERIC.v6

(limited to 'sys/arch/powerpc')

diff --git a/sys/arch/powerpc/conf/GENERIC b/sys/arch/powerpc/conf/GENERIC
index abe9da93afd..d8c1ef25efd 100644
--- a/sys/arch/powerpc/conf/GENERIC
+++ b/sys/arch/powerpc/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.11 1999/11/09 05:07:08 rahnds Exp $
+#	$OpenBSD: GENERIC,v 1.12 2000/01/09 22:00:22 itojun Exp $
 #
 # PPC GENERIC config file
 #
@@ -80,3 +80,6 @@ ofdisk*		at openfirm?	 # used for floppy support
 #ofnet*		at openfirm?
 #ofcons*	at openfirm?
 
+# for IPv6
+pseudo-device	gif		4
+#pseudo-device	faith		1
diff --git a/sys/arch/powerpc/conf/GENERIC.v6 b/sys/arch/powerpc/conf/GENERIC.v6
deleted file mode 100644
index 05eeeca3515..00000000000
--- a/sys/arch/powerpc/conf/GENERIC.v6
+++ /dev/null
@@ -1,7 +0,0 @@
-include	"arch/powerpc/conf/GENERIC"
-
-options 	INET6		# IPV6
-
-# for IPv6
-pseudo-device	gif		4
-#pseudo-device	faith		1
-- 
cgit v1.2.3