From 2e79938477e6739552b7a21625392db3c8d0a38c Mon Sep 17 00:00:00 2001
From: Ben Hutchings <benh@debian.org>
Date: Tue, 22 Nov 2011 06:22:02 +0000
Subject: [PATCH] can: Enable CAN_GW, CAN_EMS_PCMCIA, CAN_PEAK_PCI as modules

svn path=/dists/trunk/linux-2.6/; revision=18304
---
 debian/changelog     | 1 +
 debian/config/config | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3586ea184..ed298f3a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ linux-2.6 (3.2~rc2-1~experimental.1) UNRELEASED; urgency=low
   * 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
diff --git a/debian/config/config b/debian/config/config
index 47d367f24..c5abc0b4a 100644
--- a/debian/config/config
+++ b/debian/config/config
@@ -1785,7 +1785,9 @@ CONFIG_CAN_MCP251X=m
 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_BRIDGE_EBT_NFLOG=m
 CONFIG_CAN=m
 CONFIG_CAN_RAW=m
 CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
 
 ##
 ## file: net/ceph/Kconfig