Module Name: src
Committed By: riz
Date: Wed Oct 17 21:33:17 UTC 2012
Modified Files:
src/sys/arch/amd64/conf [netbsd-6]: XEN3_DOM0
src/sys/arch/i386/conf [netbsd-6]: XEN3_DOM0
Log Message:
Pull up following revision(s) (requested by khorben in ticket #572):
sys/arch/i386/conf/XEN3_DOM0: revision 1.70
sys/arch/amd64/conf/XEN3_DOM0: revision 1.88
Enable support for synaptics touchpads when running Xen as domain 0; helps
usability on laptops. Fixes PR port-xen/44055.
ok bouyer@ riz@
To generate a diff of this commit:
cvs rdiff -u -r1.77.2.6 -r1.77.2.7 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.60.2.5 -r1.60.2.6 src/sys/arch/i386/conf/XEN3_DOM0
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/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.6 src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.7
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.77.2.6 Wed Aug 15 15:32:59 2012
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Wed Oct 17 21:33:17 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.77.2.6 2012/08/15 15:32:59 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.77.2.7 2012/10/17 21:33:17 riz Exp $
include "arch/amd64/conf/std.xen"
@@ -534,6 +534,7 @@ pckbc0 at isa? # pc keyboard controll
pckbd* at pckbc? # PC keyboard
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
#vga0 at isa?
vga* at pci? dev ? function ?
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.5 src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.6
--- src/sys/arch/i386/conf/XEN3_DOM0:1.60.2.5 Wed Aug 15 15:33:00 2012
+++ src/sys/arch/i386/conf/XEN3_DOM0 Wed Oct 17 21:33:16 2012
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.60.2.5 2012/08/15 15:33:00 sborrill Exp $
+# $NetBSD: XEN3_DOM0,v 1.60.2.6 2012/10/17 21:33:16 riz Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -512,6 +512,7 @@ pckbc0 at isa? # PC keyboard controll
pckbd* at pckbc? # PC keyboard
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
#vga0 at isa?
vga* at pci? dev ? function ?
#pcdisplay0 at isa? # CGA, MDA, EGA, HGA
