From 952250ca3eafd03c48c345309e3d952bffa99611 Mon Sep 17 00:00:00 2001
From: jmcneill <jmcneill@NetBSD.org>
Date: Tue, 9 Aug 2011 02:52:29 +0000
Subject: [PATCH] remove commented out entries for emdtv, auvitek, and dtv

---
 sys/arch/amd64/conf/GENERIC | 5 ++---
 sys/arch/i386/conf/GENERIC  | 7 ++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/sys/arch/amd64/conf/GENERIC b/sys/arch/amd64/conf/GENERIC
index e062e365168c..266c1ef53d3b 100644
--- a/sys/arch/amd64/conf/GENERIC
+++ b/sys/arch/amd64/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.331 2011/08/08 18:57:58 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.332 2011/08/09 02:52:29 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.331 $"
+#ident 		"GENERIC-$Revision: 1.332 $"
 
 maxusers	64		# estimated number of users
 
@@ -1025,7 +1025,6 @@ midi*	at pcppi?		# MIDI interface to the PC speaker
 pseye* at uhub?		# Sony PLAYSTATION(R) Eye webcam
 uvideo* at uhub?	# USB Video Class capture devices
 video* at videobus?
-#dtv* at dtvbus?
 
 
 # TV cards
diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index d06a8838e83a..69fabbb19af0 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.1045 2011/08/08 18:58:18 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.1046 2011/08/09 02:52:29 jmcneill Exp $
 #
 # GENERIC machine description file
 #
@@ -22,7 +22,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident 		"GENERIC-$Revision: 1.1045 $"
+#ident 		"GENERIC-$Revision: 1.1046 $"
 
 maxusers	64		# estimated number of users
 
@@ -1421,10 +1421,7 @@ midi*	at pcppi?		# MIDI interface to the PC speaker
 
 pseye*	at uhub?		# Sony PLAYSTATION(R) Eye webcam
 uvideo* at uhub?		# USB Video Class capture devices
-#auvitek* at uhub?		# Auvitek AU0828 video capture devices
-#emdtv*	at uhub?		# Empia EM28xx video capture devices
 video* at videobus?
-#dtv* at dtvbus?
 
 
 # TV cards