[kernel] r9132 - in dists/trunk/linux-2.6/debian: . arch/m68k patches/series

[Christian T. Steigies]

Author: cts
Date: Fri Jul 13 22:01:48 2007
New Revision: 9132

Log:
enable INPUT_UINPUT on mac


Modified:
   dists/trunk/linux-2.6/debian/arch/m68k/config.mac
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra

Modified: dists/trunk/linux-2.6/debian/arch/m68k/config.mac
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/m68k/config.mac	(original)
+++ dists/trunk/linux-2.6/debian/arch/m68k/config.mac	Fri Jul 13 22:01:48 2007
@@ -64,7 +64,8 @@
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_SERIAL=m
 # CONFIG_INPUT_JOYSTICK is not set
-# CONFIG_INPUT_MISC is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_UINPUT=m
 CONFIG_SERIO=m
 CONFIG_SERIO_SERPORT=m
 CONFIG_SERIO_LIBPS2=m

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	(original)
+++ dists/trunk/linux-2.6/debian/changelog	Fri Jul 13 22:01:48 2007
@@ -16,6 +16,7 @@
   [ Christian T. Steigies ]
   * Add module.lds to kernel headers
   * Re-enable atari-scsi and atari-rom-isa patches
+  * enable INPUT_UINPUT on mac
 
   [ Martin Michlmayr ]
   * [mips] Add patch from Yoichi Yuasa to fix IDE on Cobalt.

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1-extra	Fri Jul 13 22:01:48 2007
@@ -37,5 +37,5 @@
 + bugfix/m68k/dmasound_paula.diff m68k
 + bugfix/m68k/disable-mac-broken-config-options.diff m68k
 
-+ bugfix/m68k/debian-2.6.21-2-atari-scsi.diff m68k
+#+ bugfix/m68k/debian-2.6.21-2-atari-scsi.diff m68k
 + bugfix/m68k/debian-2.6.21-2-rom-isa.diff m68k