From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: Fri, 20 Jul 2012 19:00:00 +0000 (+0200)
Subject: can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=77136836aef2c7ce9745e765c1e51a14e3933931;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

can: Kconfig: convert 'depends on CAN' into 'if CAN...endif' block

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>
---

diff --git a/drivers/net/can/Kconfig b/drivers/net/can/Kconfig
index b56bd9e80957..8088d8fa5611 100644
--- a/drivers/net/can/Kconfig
+++ b/drivers/net/can/Kconfig
@@ -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.
@@ -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
@@ -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
@@ -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
diff --git a/net/can/Kconfig b/net/can/Kconfig
index 03200699d274..0435fc42ab04 100644
--- a/net/can/Kconfig
+++ b/net/can/Kconfig
@@ -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
@@ -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,
@@ -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.
@@ -53,3 +52,5 @@ config CAN_GW
 	  by the netlink configuration interface known e.g. from iptables.
 
 source "drivers/net/can/Kconfig"
+
+endif