diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-06-16 12:08:13 -0400 |
| commit | f1bbbb6912662b9f6070c5bfc4ca9eb1f06a9d5b (patch) | |
| tree | c2c130a74be25b0b2dff992e1a195e2728bdaadd /drivers/net/can/Kconfig | |
| parent | fd0961ff67727482bb20ca7e8ea97b83e9de2ddb (diff) | |
| parent | 7e27d6e778cd87b6f2415515d7127eba53fe5d02 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'drivers/net/can/Kconfig')
| -rw-r--r-- | drivers/net/can/Kconfig | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 05b751719bd..2c5227c02fa 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig | |||
| @@ -63,6 +63,16 @@ config CAN_BFIN | |||
| 63 | To compile this driver as a module, choose M here: the | 63 | To compile this driver as a module, choose M here: the |
| 64 | module will be called bfin_can. | 64 | module will be called bfin_can. |
| 65 | 65 | ||
| 66 | config CAN_JANZ_ICAN3 | ||
| 67 | tristate "Janz VMOD-ICAN3 Intelligent CAN controller" | ||
| 68 | depends on CAN_DEV && MFD_JANZ_CMODIO | ||
| 69 | ---help--- | ||
| 70 | Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which | ||
| 71 | connects to a MODULbus carrier board. | ||
| 72 | |||
| 73 | This driver can also be built as a module. If so, the module will be | ||
| 74 | called janz-ican3.ko. | ||
| 75 | |||
| 66 | source "drivers/net/can/mscan/Kconfig" | 76 | source "drivers/net/can/mscan/Kconfig" |
| 67 | 77 | ||
| 68 | source "drivers/net/can/sja1000/Kconfig" | 78 | source "drivers/net/can/sja1000/Kconfig" |