Module Name: src
Committed By: snj
Date: Sun Sep 13 22:11:14 UTC 2009
Modified Files:
src/sys/arch/i386/conf [netbsd-5]: ALL GENERIC
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #943):
sys/arch/i386/conf/ALL: revision 1.186
sys/arch/i386/conf/GENERIC: revision 1.921
add options PMS_ELANTECH_TOUCHPAD
To generate a diff of this commit:
cvs rdiff -u -r1.183.4.2 -r1.183.4.3 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.915.2.5 -r1.915.2.6 src/sys/arch/i386/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/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.183.4.2 src/sys/arch/i386/conf/ALL:1.183.4.3
--- src/sys/arch/i386/conf/ALL:1.183.4.2 Fri May 1 01:20:41 2009
+++ src/sys/arch/i386/conf/ALL Sun Sep 13 22:11:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.183.4.2 2009/05/01 01:20:41 snj Exp $
+# $NetBSD: ALL,v 1.183.4.3 2009/09/13 22:11:14 snj Exp $
# From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
#
# ALL machine description file
@@ -17,7 +17,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "ALL-$Revision: 1.183.4.2 $"
+#ident "ALL-$Revision: 1.183.4.3 $"
maxusers 32 # estimated number of users
@@ -519,6 +519,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
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
Index: src/sys/arch/i386/conf/GENERIC
diff -u src/sys/arch/i386/conf/GENERIC:1.915.2.5 src/sys/arch/i386/conf/GENERIC:1.915.2.6
--- src/sys/arch/i386/conf/GENERIC:1.915.2.5 Sun May 3 23:45:46 2009
+++ src/sys/arch/i386/conf/GENERIC Sun Sep 13 22:11:14 2009
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.915.2.5 2009/05/03 23:45:46 snj Exp $
+# $NetBSD: GENERIC,v 1.915.2.6 2009/09/13 22:11:14 snj Exp $
#
# GENERIC machine description file
#
@@ -22,7 +22,7 @@
options INCLUDE_CONFIG_FILE # embed config file in kernel binary
-#ident "GENERIC-$Revision: 1.915.2.5 $"
+#ident "GENERIC-$Revision: 1.915.2.6 $"
maxusers 64 # estimated number of users
@@ -528,6 +528,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
vga0 at isa?
vga* at pci? dev ? function ?
pcdisplay0 at isa? # CGA, MDA, EGA, HGA
