can: Enable CAN_GW, CAN_EMS_PCMCIA, CAN_PEAK_PCI as modules

svn path=/dists/trunk/linux-2.6/; revision=18304
This commit is contained in:
Ben Hutchings 2011-11-22 06:22:02 +00:00
parent 6d75f03935
commit 2e79938477
2 changed files with 4 additions and 0 deletions

1
debian/changelog vendored
View File

@ -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

View File

@ -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