[kernel] r14822 - in dists/trunk/linux-2.6/debian: . config

[Maximilian Attems]

Author: maks
Date: Tue Dec 29 16:29:53 2009
New Revision: 14822

Log:
topconfig set modular CAN_EMS_USB

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

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Tue Dec 29 14:33:11 2009	(r14821)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Dec 29 16:29:53 2009	(r14822)
@@ -4,6 +4,9 @@
   * Correct comments referring to dpkg --print-installation-architecture
     in maintainer scripts (Closes: #558077)
 
+  [ maximilian attems ]
+  * topconfig set CAN_EMS_USB.
+
  -- Ben Hutchings <ben at decadent.org.uk>  Tue, 29 Dec 2009 15:32:44 +0100
 
 linux-2.6 (2.6.32-3) unstable; urgency=high

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Dec 29 14:33:11 2009	(r14821)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Dec 29 16:29:53 2009	(r14822)
@@ -1416,6 +1416,11 @@
 CONFIG_CAN_KVASER_PCI=m
 
 ##
+## file: drivers/net/can/usb/Kconfig
+##
+CONFIG_CAN_EMS_USB=m
+
+##
 ## file: drivers/net/hamradio/Kconfig
 ##
 CONFIG_MKISS=m