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

[Ben Hutchings]

Author: benh
Date: Mon May 30 20:42:33 2011
New Revision: 17492

Log:
can: Enable CAN_SOFTING, CAN_SOFTING_CS as modules

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	Mon May 30 20:39:20 2011	(r17491)
+++ dists/trunk/linux-2.6/debian/changelog	Mon May 30 20:42:33 2011	(r17492)
@@ -20,6 +20,7 @@
     IP_SET_HASH_IPPORTIP, IP_SET_HASH_IPPORTNET, IP_SET_HASH_NET,
     IP_SET_HASH_NETPORT, IP_SET_LIST_SET, NETFILTER_XT_SET as modules
   * net/sched: Enable NET_SCH_QFQ as module
+  * can: Enable CAN_SOFTING, CAN_SOFTING_CS as modules
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sat, 21 May 2011 22:13:08 +0100
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Mon May 30 20:39:20 2011	(r17491)
+++ dists/trunk/linux-2.6/debian/config/config	Mon May 30 20:42:33 2011	(r17492)
@@ -1667,6 +1667,12 @@
 CONFIG_CAN_TSCAN1=m
 
 ##
+## file: drivers/net/can/softing/Kconfig
+##
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+##
 ## file: drivers/net/can/usb/Kconfig
 ##
 CONFIG_CAN_EMS_USB=m