[kernel] r15959 - in dists/trunk/linux-2.6: . debian debian/config/armel
Ben Hutchings
benh at alioth.debian.org
Tue Jul 6 23:33:41 UTC 2010
Author: benh
Date: Tue Jul 6 23:33:36 2010
New Revision: 15959
Log:
Merge tbm's armel changes from 2.6.32-16
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/armel/config
dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
dists/trunk/linux-2.6/debian/linux-base.postinst (props changed)
dists/trunk/linux-2.6/debian/linux-base.templates (props changed)
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Tue Jul 6 14:03:52 2010 (r15958)
+++ dists/trunk/linux-2.6/debian/changelog Tue Jul 6 23:33:36 2010 (r15959)
@@ -57,6 +57,8 @@
* [armel/kirkwood] Enable FB_XGI and FRAMEBUFFER_CONSOLE.
* [armel] Make MOUSE_PS2 modular.
* [armel] Build INPUT_UINPUT for all flavours.
+ * [armel/kirkwood] Enable FB_UDL.
+ * [armel] Disable PARPORT_PC (Closes: #588164)
[ Bastian Blank ]
* Disable mISDN support for NETJet cards. The driver binds a generic PCI
Modified: dists/trunk/linux-2.6/debian/config/armel/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config Tue Jul 6 14:03:52 2010 (r15958)
+++ dists/trunk/linux-2.6/debian/config/armel/config Tue Jul 6 23:33:36 2010 (r15959)
@@ -100,3 +100,4 @@
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
+# CONFIG_PARPORT_PC is not set
Modified: dists/trunk/linux-2.6/debian/config/armel/config.kirkwood
==============================================================================
--- dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Tue Jul 6 14:03:52 2010 (r15958)
+++ dists/trunk/linux-2.6/debian/config/armel/config.kirkwood Tue Jul 6 23:33:36 2010 (r15959)
@@ -633,3 +633,8 @@
##
CONFIG_FB_XGI=m
+##
+## file: drivers/staging/udlfb/Kconfig
+##
+CONFIG_FB_UDL=m
+
More information about the Kernel-svn-changes
mailing list