debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge tbm's armel changes from 2.6.32-16 

svn path=/dists/trunk/linux-2.6/; revision=15959
This commit is contained in:
Ben Hutchings 2010-07-06 23:33:36 +00:00
parent 25ca77847f
commit 1fe01215f2
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
debian/changelog vendored
View File

@ -57,6 +57,8 @@ linux-2.6 (2.6.35~rc4-1~experimental.1) UNRELEASED; urgency=low
* [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

1
debian/config/armel/config vendored
View File

@ -100,3 +100,4 @@ CONFIG_MOUSE_APPLETOUCH=m
CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=m
# CONFIG_PARPORT_PC is not set

5
debian/config/armel/config.kirkwood vendored
View File

@ -633,3 +633,8 @@ CONFIG_X25=m
##
CONFIG_FB_XGI=m
##
## file: drivers/staging/udlfb/Kconfig
##
CONFIG_FB_UDL=m