Module Name: src
Committed By: jmcneill
Date: Mon Jan 16 14:44:07 UTC 2012
Modified Files:
src/sys/arch/amd64/conf: GENERIC
Log Message:
add irmce(4), cir@irmce, and cir@emdtv
To generate a diff of this commit:
cvs rdiff -u -r1.344 -r1.345 src/sys/arch/amd64/conf/GENERIC
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/GENERIC
diff -u src/sys/arch/amd64/conf/GENERIC:1.344 src/sys/arch/amd64/conf/GENERIC:1.345
--- src/sys/arch/amd64/conf/GENERIC:1.344 Sun Jan 15 15:05:07 2012
+++ src/sys/arch/amd64/conf/GENERIC Mon Jan 16 14:44:07 2012
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.344 2012/01/15 15:05:07 jmcneill Exp $
+# $NetBSD: GENERIC,v 1.345 2012/01/16 14:44:07 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.344 $"
+#ident "GENERIC-$Revision: 1.345 $"
maxusers 64 # estimated number of users
@@ -882,6 +882,10 @@ irframe* at stuirda?
ustir* at uhub? port ?
irframe* at ustir?
+# Windows Media Center IR transceiver
+irmce* at uhub? port ?
+cir* at irmce?
+
# USB Ethernet adapters
aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters
axe* at uhub? port ? # ASIX AX88172 based adapters
@@ -1052,6 +1056,7 @@ auvitek* at uhub? # Auvitek AU0828 USB
coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV
cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV
emdtv* at uhub? # Empia EM28xx USB TV
+cir* at emdtv?
pseye* at uhub? # Sony PLAYSTATION(R) Eye webcam
uvideo* at uhub? # USB Video Class capture devices
