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

[Ben Hutchings]

Author: benh
Date: Tue Nov 22 06:22:02 2011
New Revision: 18304

Log:
can: Enable CAN_GW, CAN_EMS_PCMCIA, CAN_PEAK_PCI 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	Tue Nov 22 06:18:58 2011	(r18303)
+++ dists/trunk/linux-2.6/debian/changelog	Tue Nov 22 06:22:02 2011	(r18304)
@@ -4,6 +4,7 @@
   * New upstream release candidate
   * aufs: Update to aufs3.x-rcN-20111114
   * ieee802154: Enable IEEE802154_6LOWPAN as module
+  * can: Enable CAN_GW, CAN_EMS_PCMCIA, CAN_PEAK_PCI as modules
 
   [ Uwe Kleine-König ]
   * [amd64] reenable rt featureset with 3.2-rc2-rt3

Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config	Tue Nov 22 06:18:58 2011	(r18303)
+++ dists/trunk/linux-2.6/debian/config/config	Tue Nov 22 06:22:02 2011	(r18304)
@@ -1785,7 +1785,9 @@
 CONFIG_CAN_SJA1000=m
 CONFIG_CAN_SJA1000_ISA=m
 # CONFIG_CAN_SJA1000_PLATFORM is not set
+CONFIG_CAN_EMS_PCMCIA=m
 CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_PEAK_PCI=m
 CONFIG_CAN_KVASER_PCI=m
 CONFIG_CAN_PLX_PCI=m
 CONFIG_CAN_TSCAN1=m
@@ -3941,6 +3943,7 @@
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
 
 ##
 ## file: net/ceph/Kconfig