diff options
| author | Baptiste Jonglez | 2016-03-22 13:12:31 +0100 |
|---|---|---|
| committer | Baptiste Jonglez | 2016-03-22 13:13:09 +0100 |
| commit | a1a666590e37775af0c7930adaf88c3f6f020e81 (patch) | |
| tree | 6e2590fe6d5574439074e0e5e5de1744150cbf93 /config.x86_64 | |
| parent | 6fccb242bb61208f5e8027828d5f267942e57a4f (diff) | |
| download | aur-a1a666590e37775af0c7930adaf88c3f6f020e81.tar.gz | |
linux-mptcp: add CAN subsystem #43209 (see r245234 in upstream arch packages)
This is only applied to the x86_64 config for now.
Diffstat (limited to 'config.x86_64')
| -rw-r--r-- | config.x86_64 | 51 |
1 files changed, 49 insertions, 2 deletions
diff --git a/config.x86_64 b/config.x86_64 index 56f271bf78fd..bca530d9f046 100644 --- a/config.x86_64 +++ b/config.x86_64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 4.1.20-5 Kernel Configuration +# Linux/x86 4.1.20-6 Kernel Configuration # CONFIG_64BIT=y CONFIG_X86_64=y @@ -1412,7 +1412,54 @@ CONFIG_BAYCOM_SER_FDX=m CONFIG_BAYCOM_SER_HDX=m CONFIG_BAYCOM_PAR=m CONFIG_YAM=m -# CONFIG_CAN is not set +CONFIG_CAN=m +CONFIG_CAN_RAW=m +CONFIG_CAN_BCM=m +CONFIG_CAN_GW=m + +# +# CAN Device Drivers +# +CONFIG_CAN_VCAN=m +CONFIG_CAN_SLCAN=m +CONFIG_CAN_DEV=m +CONFIG_CAN_CALC_BITTIMING=y +CONFIG_CAN_LEDS=y +CONFIG_CAN_SJA1000=m +# CONFIG_CAN_SJA1000_ISA is not set +CONFIG_CAN_SJA1000_PLATFORM=m +# CONFIG_CAN_EMS_PCMCIA is not set +CONFIG_CAN_EMS_PCI=m +CONFIG_CAN_PEAK_PCMCIA=m +CONFIG_CAN_PEAK_PCI=m +CONFIG_CAN_PEAK_PCIEC=y +CONFIG_CAN_KVASER_PCI=m +CONFIG_CAN_PLX_PCI=m +CONFIG_CAN_C_CAN=m +CONFIG_CAN_C_CAN_PLATFORM=m +CONFIG_CAN_C_CAN_PCI=m +CONFIG_CAN_M_CAN=m +CONFIG_CAN_CC770=m +# CONFIG_CAN_CC770_ISA is not set +CONFIG_CAN_CC770_PLATFORM=m + +# +# CAN SPI interfaces +# +# CONFIG_CAN_MCP251X is not set + +# +# CAN USB interfaces +# +CONFIG_CAN_EMS_USB=m +CONFIG_CAN_ESD_USB2=m +CONFIG_CAN_GS_USB=m +CONFIG_CAN_KVASER_USB=m +CONFIG_CAN_PEAK_USB=m +CONFIG_CAN_8DEV_USB=m +CONFIG_CAN_SOFTING=m +# CONFIG_CAN_SOFTING_CS is not set +# CONFIG_CAN_DEBUG_DEVICES is not set CONFIG_IRDA=m # |