diff --git a/debian/changelog b/debian/changelog index db54ff8f2..c8377071a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,7 +7,8 @@ linux-2.6 (2.6.31~rc2-1~experimental.1) UNRELEASED; urgency=low * [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 ] diff --git a/debian/config/config b/debian/config/config index 74bd42097..d86065aee 100644 --- a/debian/config/config +++ b/debian/config/config @@ -1368,6 +1368,11 @@ CONFIG_BE2NET=m ## 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 ##