[kernel] r4731 - in dists/sid/linux-2.6/debian: . arch/powerpc

[Sven Luther]

Author: luther
Date: 2005-11-05 18:23:12 +0000 (Sat, 05 Nov 2005)
New Revision: 4731

Modified:
   dists/sid/linux-2.6/debian/arch/powerpc/config
   dists/sid/linux-2.6/debian/changelog
Log:
Reverted unwarranted change with makx which is just to lazy or whatever to fix initramfs-tools correctly.


Modified: dists/sid/linux-2.6/debian/arch/powerpc/config
===================================================================
--- dists/sid/linux-2.6/debian/arch/powerpc/config	2005-11-05 18:10:53 UTC (rev 4730)
+++ dists/sid/linux-2.6/debian/arch/powerpc/config	2005-11-05 18:23:12 UTC (rev 4731)
@@ -614,7 +614,7 @@
 CONFIG_INPUT_EVDEV=m
 CONFIG_INPUT_EVBUG=m
 CONFIG_INPUT_KEYBOARD=y
-CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_ATKBD=m
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_LKKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
@@ -653,8 +653,8 @@
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_PCSPKR=m
 CONFIG_INPUT_UINPUT=m
-CONFIG_SERIO=y
-CONFIG_SERIO_I8042=y
+CONFIG_SERIO=m
+CONFIG_SERIO_I8042=m
 CONFIG_SERIO_SERPORT=m
 # CONFIG_SERIO_PCIPS2 is not set
 CONFIG_SERIO_LIBPS2=m

Modified: dists/sid/linux-2.6/debian/changelog
===================================================================
--- dists/sid/linux-2.6/debian/changelog	2005-11-05 18:10:53 UTC (rev 4730)
+++ dists/sid/linux-2.6/debian/changelog	2005-11-05 18:23:12 UTC (rev 4731)
@@ -11,7 +11,6 @@
   * Reenable CONFIG_SOFTWARE_SUSPEND on i386 and ppc, resume=/dev/<other device>
     must be set by boot loader. (Closes: #267600)
   * Set CONFIG_USB_SUSPEND on i386. Usefull for suspend to ram and apm suspend.
-  * Set CONFIG_KEYBOARD_ATKBD and CONFIG_SERIO_I8042=y on ppc.
 
   [ Jurij Smakov ]
   * Fix the install-image script to correctly include all the necessary
@@ -28,7 +27,7 @@
   * net-ipconntrack-nat-fix.patch - fix compilation of
     ip_conntrack_helper_pptp.c when NAT is disabled. (Closes: #336431)
 
- -- maximilian attems <maks at sternwelten.at>  Sat,  5 Nov 2005 19:06:28 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Fri,  4 Nov 2005 10:45:06 +0100
 
 linux-2.6 (2.6.14-2) unstable; urgency=low