summaryrefslogtreecommitdiffstats
path: root/drivers/net/can/Kconfig
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-06 08:23:37 +0200
committerDavid S. Miller <davem@davemloft.net>2011-07-06 08:23:37 +0200
commite12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4 (patch)
tree83c0e192ccaa4752c80b6131a7d0aa8272b5d0d0 /drivers/net/can/Kconfig
parentb44: Use pr_<level>_once and DRV_DESCRIPTION (diff)
parentnet: vlan: enable soft features regardless of underlying device (diff)
downloadlinux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.tar.xz
linux-e12fe68ce34d60c04bb1ddb1d3cc5c3022388fe4.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/can/Kconfig')
-rw-r--r--drivers/net/can/Kconfig4
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
config CAN_DEV
tristate "Platform CAN drivers with Netlink support"
depends on CAN
- default Y
+ default y
---help---
Enables the common framework for platform CAN drivers with Netlink
support. This is the standard library for CAN drivers.
@@ -43,7 +43,7 @@ config CAN_DEV
config CAN_CALC_BITTIMING
bool "CAN bit-timing calculation"
depends on CAN_DEV
- default Y
+ default y
---help---
If enabled, CAN bit-timing parameters will be calculated for the
bit-rate specified via Netlink argument "bitrate" when the device