diff options
| author | David S. Miller <davem@davemloft.net> | 2011-07-06 02:23:37 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-06 02:23:37 -0400 |
| commit | e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch) | |
| tree | 83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /drivers/net/can | |
| parent | 7329f0d58de01878d9ce4f0be7a76e136f223eef (diff) | |
| parent | 712ae51afd55b20c04c5383d02ba5d10233313b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/can')
| -rw-r--r-- | drivers/net/can/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig index 906366b54037..f6c98fb4a517 100644 --- a/drivers/net/can/Kconfig +++ b/drivers/net/can/Kconfig | |||
| @@ -34,7 +34,7 @@ config CAN_SLCAN | |||
| 34 | config CAN_DEV | 34 | config CAN_DEV |
| 35 | tristate "Platform CAN drivers with Netlink support" | 35 | tristate "Platform CAN drivers with Netlink support" |
| 36 | depends on CAN | 36 | depends on CAN |
| 37 | default Y | 37 | default y |
| 38 | ---help--- | 38 | ---help--- |
| 39 | Enables the common framework for platform CAN drivers with Netlink | 39 | Enables the common framework for platform CAN drivers with Netlink |
| 40 | support. This is the standard library for CAN drivers. | 40 | support. This is the standard library for CAN drivers. |
| @@ -43,7 +43,7 @@ config CAN_DEV | |||
| 43 | config CAN_CALC_BITTIMING | 43 | config CAN_CALC_BITTIMING |
| 44 | bool "CAN bit-timing calculation" | 44 | bool "CAN bit-timing calculation" |
| 45 | depends on CAN_DEV | 45 | depends on CAN_DEV |
| 46 | default Y | 46 | default y |
| 47 | ---help--- | 47 | ---help--- |
| 48 | If enabled, CAN bit-timing parameters will be calculated for the | 48 | If enabled, CAN bit-timing parameters will be calculated for the |
| 49 | bit-rate specified via Netlink argument "bitrate" when the device | 49 | bit-rate specified via Netlink argument "bitrate" when the device |