diff options
| author | James Morris <jmorris@namei.org> | 2009-12-09 09:01:03 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-12-09 09:01:03 +0100 |
| commit | 1ad1f10cd915744bbe52b19423653b38287d827d (patch) | |
| tree | ae072aace36b45a55d80b8cbf1b6d92523a88ea0 /drivers/net/can/Kconfig | |
| parent | selinux: remove a useless return (diff) | |
| parent | Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.k... (diff) | |
| download | linux-1ad1f10cd915744bbe52b19423653b38287d827d.tar.xz linux-1ad1f10cd915744bbe52b19423653b38287d827d.zip | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/can/Kconfig')
| -rw-r--r-- | drivers/net/can/Kconfig | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 772f6d2489ce..bb803fa1e6a7 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig @@ -41,6 +41,21 @@ config CAN_AT91 ---help--- This is a driver for the SoC CAN controller in Atmel's AT91SAM9263. +config CAN_TI_HECC + depends on CAN_DEV && ARCH_OMAP3 + tristate "TI High End CAN Controller" + ---help--- + Driver for TI HECC (High End CAN Controller) module found on many + TI devices. The device specifications are available from www.ti.com + +config CAN_MCP251X + tristate "Microchip MCP251x SPI CAN controllers" + depends on CAN_DEV && SPI + ---help--- + Driver for the Microchip MCP251x SPI CAN controllers. + +source "drivers/net/can/mscan/Kconfig" + source "drivers/net/can/sja1000/Kconfig" source "drivers/net/can/usb/Kconfig" |