Module Name: src
Committed By: snj
Date: Sun Sep 13 22:12:12 UTC 2009
Modified Files:
src/sys/arch/amd64/conf [netbsd-5]: GENERIC
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #943):
sys/arch/amd64/conf/GENERIC: revision 1.235
add options PMS_ELANTECH_TOUCHPAD
To generate a diff of this commit:
cvs rdiff -u -r1.231.4.3 -r1.231.4.4 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.231.4.3 src/sys/arch/amd64/conf/GENERIC:1.231.4.4
--- src/sys/arch/amd64/conf/GENERIC:1.231.4.3 Sun May 3 23:45:46 2009
+++ src/sys/arch/amd64/conf/GENERIC Sun Sep 13 22:12:12 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.231.4.3 2009/05/03 23:45:46 snj Exp $
+# $NetBSD: GENERIC,v 1.231.4.4 2009/09/13 22:12:12 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.231.4.3 $"
+#ident "GENERIC-$Revision: 1.231.4.4 $"
maxusers 64 # estimated number of users
@@ -355,6 +355,7 @@
pms* at pckbc? # PS/2 mouse for wsmouse
#options PMS_DISABLE_POWERHOOK # Disable PS/2 reset on resume
options PMS_SYNAPTICS_TOUCHPAD # Enable support for Synaptics Touchpads
+options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads
vga* at pci? dev ? function ?
wsdisplay* at vga? console ?
wskbd* at pckbd? console ?
