[kernel] r12794 - dists/trunk/linux-2.6/debian/config/i386

[Maximilian Attems]

Author: maks
Date: Fri Feb 13 17:29:06 2009
New Revision: 12794

Log:
x86_32: only set MOUSE_PS2_OLPC on 486

as OLPC is unset otherwise..

Modified:
   dists/trunk/linux-2.6/debian/config/i386/config
   dists/trunk/linux-2.6/debian/config/i386/config.486

Modified: dists/trunk/linux-2.6/debian/config/i386/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config	Fri Feb 13 17:29:06 2009
@@ -708,7 +708,7 @@
 ##
 CONFIG_INPUT_MOUSE=y
 CONFIG_MOUSE_PS2=m
-CONFIG_MOUSE_PS2_OLPC=y
+# CONFIG_MOUSE_PS2_OLPC is not set
 CONFIG_MOUSE_SERIAL=m
 CONFIG_MOUSE_APPLETOUCH=m
 CONFIG_MOUSE_BCM5974=m

Modified: dists/trunk/linux-2.6/debian/config/i386/config.486
==============================================================================
--- dists/trunk/linux-2.6/debian/config/i386/config.486	(original)
+++ dists/trunk/linux-2.6/debian/config/i386/config.486	Fri Feb 13 17:29:06 2009
@@ -54,6 +54,11 @@
 CONFIG_I2C_STUB=m
 
 ##
+## file: drivers/input/mouse/Kconfig
+##
+CONFIG_MOUSE_PS2_OLPC=y
+
+##
 ## file: drivers/isdn/i4l/Kconfig
 ##
 CONFIG_ISDN_DRV_LOOP=m