[kernel] r15935 - in dists/sid/linux-2.6/debian: . config

[Ben Hutchings]

Author: benh
Date: Sun Jul  4 21:21:18 2010
New Revision: 15935

Log:
Enable SERIAL_USB_TI (Closes: #588096) and SERIAL_USB_WHITEHEAT

Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/config/config

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	Sun Jul  4 21:07:52 2010	(r15934)
+++ dists/sid/linux-2.6/debian/changelog	Sun Jul  4 21:21:18 2010	(r15935)
@@ -58,9 +58,9 @@
   * Add r8192u_usb driver
   * Add linux-tools-<version> package containing the perf tool
     (Closes: #548715)
+  * Enable SERIAL_USB_TI (Closes: #588096) and SERIAL_USB_WHITEHEAT
 
   [ Aurelien Jarno ]
-  * [sh4] fix sh_tmu clocksource following recent nohz changes.
   * [sh4] optimize runtime disabling of trapped I/O. 
   * [mips] backport mips/swarm: fix M3 TLB exception handler.
 

Modified: dists/sid/linux-2.6/debian/config/config
==============================================================================
--- dists/sid/linux-2.6/debian/config/config	Sun Jul  4 21:07:52 2010	(r15934)
+++ dists/sid/linux-2.6/debian/config/config	Sun Jul  4 21:21:18 2010	(r15935)
@@ -2464,7 +2464,7 @@
 CONFIG_USB_SERIAL_ARK3116=m
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_CH341=m
-# CONFIG_USB_SERIAL_WHITEHEAT is not set
+CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
 CONFIG_USB_SERIAL_CP210X=m
 CONFIG_USB_SERIAL_CYPRESS_M8=m
@@ -2498,7 +2498,7 @@
 CONFIG_USB_SERIAL_SIEMENS_MPI=m
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
 CONFIG_USB_SERIAL_SYMBOL=m
-# CONFIG_USB_SERIAL_TI is not set
+CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_CYBERJACK=m
 CONFIG_USB_SERIAL_XIRCOM=m
 CONFIG_USB_SERIAL_OPTION=m