Skip to content

Commit

Permalink
can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block
Browse files Browse the repository at this point in the history
This patch adds an 'if CAN...endif' Block around all CAN symbols in
net/can/Kconfig. So the 'depends on CAN' dependencies can be removed.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Marc Kleine-Budde committed Jan 26, 2013
1 parent 93b9c1d commit 7713683
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 8 deletions.
5 changes: 0 additions & 5 deletions drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
menu "CAN Device Drivers"
depends on CAN

config CAN_VCAN
tristate "Virtual Local CAN Interface (vcan)"
depends on CAN
---help---
Similar to the network loopback devices, vcan offers a
virtual local CAN interface.
Expand All @@ -13,7 +11,6 @@ config CAN_VCAN

config CAN_SLCAN
tristate "Serial / USB serial CAN Adaptors (slcan)"
depends on CAN
---help---
CAN driver for several 'low cost' CAN interfaces that are attached
via serial lines or via USB-to-serial adapters using the LAWICEL
Expand All @@ -33,7 +30,6 @@ config CAN_SLCAN

config CAN_DEV
tristate "Platform CAN drivers with Netlink support"
depends on CAN
default y
---help---
Enables the common framework for platform CAN drivers with Netlink
Expand Down Expand Up @@ -133,7 +129,6 @@ source "drivers/net/can/softing/Kconfig"

config CAN_DEBUG_DEVICES
bool "CAN devices debugging messages"
depends on CAN
---help---
Say Y here if you want the CAN device drivers to produce a bunch of
debug messages to the system log. Select this if you are having
Expand Down
7 changes: 4 additions & 3 deletions net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ menuconfig CAN
If you want CAN support you should say Y here and also to the
specific driver for your controller(s) below.

if CAN

config CAN_RAW
tristate "Raw CAN Protocol (raw access with CAN-ID filtering)"
depends on CAN
default N
---help---
The raw CAN protocol option offers access to the CAN bus via
Expand All @@ -29,7 +30,6 @@ config CAN_RAW

config CAN_BCM
tristate "Broadcast Manager CAN Protocol (with content filtering)"
depends on CAN
default N
---help---
The Broadcast Manager offers content filtering, timeout monitoring,
Expand All @@ -42,7 +42,6 @@ config CAN_BCM

config CAN_GW
tristate "CAN Gateway/Router (with netlink configuration)"
depends on CAN
default N
---help---
The CAN Gateway/Router is used to route (and modify) CAN frames.
Expand All @@ -53,3 +52,5 @@ config CAN_GW
by the netlink configuration interface known e.g. from iptables.

source "drivers/net/can/Kconfig"

endif

0 comments on commit 7713683

Please sign in to comment.