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

[Maximilian Attems]

Author: maks
Date: Wed Jul  8 14:12:47 2009
New Revision: 13898

Log:
enable all of the modular CAN device drivers

also set CAN bit-timing

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	Wed Jul  8 07:53:44 2009	(r13897)
+++ dists/trunk/linux-2.6/debian/changelog	Wed Jul  8 14:12:47 2009	(r13898)
@@ -7,7 +7,8 @@
   * [powerpc64] Enable modular RTC_DRV_PS3, PS3_VRAM.
   * Set new NETFILTER_XT_MATCH_OSF, FIREWIRE_NET, SND_CTXFI, USB_XHCI_HCD,
     IEEE802154, CAN_DEV, EEPROM_MAX6875, DM_LOG_USERSPACE, DM_MULTIPATH_QL,
-    DM_MULTIPATH_ST, LIBERTAS_SPI.
+    DM_MULTIPATH_ST, LIBERTAS_SPI, CAN_SJA1000, CAN_SJA1000_PLATFORM,
+    CAN_EMS_PCI, CAN_KVASER_PCI.
   * Disable v4l1 ov511 and quickcam_messenger drivers.
 
   [ Ben Hutchings ]

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Wed Jul  8 07:53:44 2009	(r13897)
+++ dists/trunk/linux-2.6/debian/config/config	Wed Jul  8 14:12:47 2009	(r13898)
@@ -1368,6 +1368,11 @@
 ##
 CONFIG_CAN_VCAN=m
 CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_KVASER_PCI=m
 # CONFIG_CAN_DEBUG_DEVICES is not set
 
 ##