diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/can/Kconfig | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/can/Kconfig')
| -rw-r--r-- | drivers/net/can/Kconfig | 37 |
1 files changed, 35 insertions, 2 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 9d9e45394433..754df5ef1729 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig | |||
| @@ -12,10 +12,31 @@ config CAN_VCAN | |||
| 12 | This driver can also be built as a module. If so, the module | 12 | This driver can also be built as a module. If so, the module |
| 13 | will be called vcan. | 13 | will be called vcan. |
| 14 | 14 | ||
| 15 | config CAN_SLCAN | ||
| 16 | tristate "Serial / USB serial CAN Adaptors (slcan)" | ||
| 17 | depends on CAN | ||
| 18 | default N | ||
| 19 | ---help--- | ||
| 20 | CAN driver for several 'low cost' CAN interfaces that are attached | ||
| 21 | via serial lines or via USB-to-serial adapters using the LAWICEL | ||
| 22 | ASCII protocol. The driver implements the tty linediscipline N_SLCAN. | ||
| 23 | |||
| 24 | As only the sending and receiving of CAN frames is implemented, this | ||
| 25 | driver should work with the (serial/USB) CAN hardware from: | ||
| 26 | www.canusb.com / www.can232.com / www.mictronics.de / www.canhack.de | ||
| 27 | |||
| 28 | Userspace tools to attach the SLCAN line discipline (slcan_attach, | ||
| 29 | slcand) can be found in the can-utils at the SocketCAN SVN, see | ||
| 30 | http://developer.berlios.de/projects/socketcan for details. | ||
| 31 | |||
| 32 | The slcan driver supports up to 10 CAN netdevices by default which | ||
| 33 | can be changed by the 'maxdev=xx' module option. This driver can | ||
| 34 | also be built as a module. If so, the module will be called slcan. | ||
| 35 | |||
| 15 | config CAN_DEV | 36 | config CAN_DEV |
| 16 | tristate "Platform CAN drivers with Netlink support" | 37 | tristate "Platform CAN drivers with Netlink support" |
| 17 | depends on CAN | 38 | depends on CAN |
| 18 | default Y | 39 | default y |
| 19 | ---help--- | 40 | ---help--- |
| 20 | Enables the common framework for platform CAN drivers with Netlink | 41 | Enables the common framework for platform CAN drivers with Netlink |
| 21 | support. This is the standard library for CAN drivers. | 42 | support. This is the standard library for CAN drivers. |
| @@ -24,7 +45,7 @@ config CAN_DEV | |||
| 24 | config CAN_CALC_BITTIMING | 45 | config CAN_CALC_BITTIMING |
| 25 | bool "CAN bit-timing calculation" | 46 | bool "CAN bit-timing calculation" |
| 26 | depends on CAN_DEV | 47 | depends on CAN_DEV |
| 27 | default Y | 48 | default y |
| 28 | ---help--- | 49 | ---help--- |
| 29 | If enabled, CAN bit-timing parameters will be calculated for the | 50 | If enabled, CAN bit-timing parameters will be calculated for the |
| 30 | bit-rate specified via Netlink argument "bitrate" when the device | 51 | bit-rate specified via Netlink argument "bitrate" when the device |
| @@ -82,12 +103,24 @@ config CAN_FLEXCAN | |||
| 82 | ---help--- | 103 | ---help--- |
| 83 | Say Y here if you want to support for Freescale FlexCAN. | 104 | Say Y here if you want to support for Freescale FlexCAN. |
| 84 | 105 | ||
| 106 | config PCH_CAN | ||
| 107 | tristate "PCH CAN" | ||
| 108 | depends on CAN_DEV && PCI | ||
| 109 | ---help--- | ||
| 110 | This driver is for PCH CAN of Topcliff which is an IOH for x86 | ||
| 111 | embedded processor. | ||
| 112 | This driver can access CAN bus. | ||
| 113 | |||
| 85 | source "drivers/net/can/mscan/Kconfig" | 114 | source "drivers/net/can/mscan/Kconfig" |
| 86 | 115 | ||
| 87 | source "drivers/net/can/sja1000/Kconfig" | 116 | source "drivers/net/can/sja1000/Kconfig" |
| 88 | 117 | ||
| 118 | source "drivers/net/can/c_can/Kconfig" | ||
| 119 | |||
| 89 | source "drivers/net/can/usb/Kconfig" | 120 | source "drivers/net/can/usb/Kconfig" |
| 90 | 121 | ||
| 122 | source "drivers/net/can/softing/Kconfig" | ||
| 123 | |||
| 91 | config CAN_DEBUG_DEVICES | 124 | config CAN_DEBUG_DEVICES |
| 92 | bool "CAN devices debugging messages" | 125 | bool "CAN devices debugging messages" |
| 93 | depends on CAN | 126 | depends on CAN |