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

[Ben Hutchings]

Author: benh
Date: Sun Dec  5 00:53:34 2010
New Revision: 16639

Log:
can: Enable CAN_SJA1000_ISA, CAN_TSCAN1 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	Sun Dec  5 00:50:35 2010	(r16638)
+++ dists/trunk/linux-2.6/debian/changelog	Sun Dec  5 00:53:34 2010	(r16639)
@@ -25,6 +25,7 @@
   * 9p: Enable 9P_FS_POSIX_ACL
   * netfilter: Enable IP_VS_PE_SIP
   * net/sched: Enable NET_ACT_CSUM
+  * can: Enable CAN_SJA1000_ISA, CAN_TSCAN1 as modules
 
  -- maximilian attems <max at stro.at>  Wed, 31 Oct 2010 13:23:11 +0200
 

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Sun Dec  5 00:50:35 2010	(r16638)
+++ dists/trunk/linux-2.6/debian/config/config	Sun Dec  5 00:53:34 2010	(r16639)
@@ -1666,9 +1666,11 @@
 ## file: drivers/net/can/sja1000/Kconfig
 ##
 CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_ISA=m
 CONFIG_CAN_EMS_PCI=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_TSCAN1=m
 
 ##
 ## file: drivers/net/can/usb/Kconfig