Просмотр исходного кода

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

This patch adds an 'if CAN_DEV...endif' Block around the CAN driver
symbols in drivers/net/can/Kconfig. So the 'depends on CAN' dependencies
can be removed.

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Marc Kleine-Budde 13 лет назад
Родитель
Сommit
6586c5d74e

+ 12 - 9
drivers/net/can/Kconfig

@@ -36,9 +36,10 @@ config CAN_DEV
 	  support. This is the standard library for CAN drivers.
 	  support. This is the standard library for CAN drivers.
 	  If unsure, say Y.
 	  If unsure, say Y.
 
 
+if CAN_DEV
+
 config CAN_CALC_BITTIMING
 config CAN_CALC_BITTIMING
 	bool "CAN bit-timing calculation"
 	bool "CAN bit-timing calculation"
-	depends on CAN_DEV
 	default y
 	default y
 	---help---
 	---help---
 	  If enabled, CAN bit-timing parameters will be calculated for the
 	  If enabled, CAN bit-timing parameters will be calculated for the
@@ -52,13 +53,13 @@ config CAN_CALC_BITTIMING
 
 
 config CAN_AT91
 config CAN_AT91
 	tristate "Atmel AT91 onchip CAN controller"
 	tristate "Atmel AT91 onchip CAN controller"
-	depends on CAN_DEV && (ARCH_AT91SAM9263 || ARCH_AT91SAM9X5)
+	depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9X5
 	---help---
 	---help---
 	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
 	  This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
 	  and AT91SAM9X5 processors.
 	  and AT91SAM9X5 processors.
 
 
 config CAN_TI_HECC
 config CAN_TI_HECC
-	depends on CAN_DEV && ARCH_OMAP3
+	depends on ARCH_OMAP3
 	tristate "TI High End CAN Controller"
 	tristate "TI High End CAN Controller"
 	---help---
 	---help---
 	  Driver for TI HECC (High End CAN Controller) module found on many
 	  Driver for TI HECC (High End CAN Controller) module found on many
@@ -66,12 +67,12 @@ config CAN_TI_HECC
 
 
 config CAN_MCP251X
 config CAN_MCP251X
 	tristate "Microchip MCP251x SPI CAN controllers"
 	tristate "Microchip MCP251x SPI CAN controllers"
-	depends on CAN_DEV && SPI && HAS_DMA
+	depends on SPI && HAS_DMA
 	---help---
 	---help---
 	  Driver for the Microchip MCP251x SPI CAN controllers.
 	  Driver for the Microchip MCP251x SPI CAN controllers.
 
 
 config CAN_BFIN
 config CAN_BFIN
-	depends on CAN_DEV && (BF534 || BF536 || BF537 || BF538 || BF539 || BF54x)
+	depends on BF534 || BF536 || BF537 || BF538 || BF539 || BF54x
 	tristate "Analog Devices Blackfin on-chip CAN"
 	tristate "Analog Devices Blackfin on-chip CAN"
 	---help---
 	---help---
 	  Driver for the Analog Devices Blackfin on-chip CAN controllers
 	  Driver for the Analog Devices Blackfin on-chip CAN controllers
@@ -81,7 +82,7 @@ config CAN_BFIN
 
 
 config CAN_JANZ_ICAN3
 config CAN_JANZ_ICAN3
 	tristate "Janz VMOD-ICAN3 Intelligent CAN controller"
 	tristate "Janz VMOD-ICAN3 Intelligent CAN controller"
-	depends on CAN_DEV && MFD_JANZ_CMODIO
+	depends on MFD_JANZ_CMODIO
 	---help---
 	---help---
 	  Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which
 	  Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which
 	  connects to a MODULbus carrier board.
 	  connects to a MODULbus carrier board.
@@ -94,13 +95,13 @@ config HAVE_CAN_FLEXCAN
 
 
 config CAN_FLEXCAN
 config CAN_FLEXCAN
 	tristate "Support for Freescale FLEXCAN based chips"
 	tristate "Support for Freescale FLEXCAN based chips"
-	depends on CAN_DEV && HAVE_CAN_FLEXCAN
+	depends on HAVE_CAN_FLEXCAN
 	---help---
 	---help---
 	  Say Y here if you want to support for Freescale FlexCAN.
 	  Say Y here if you want to support for Freescale FlexCAN.
 
 
 config PCH_CAN
 config PCH_CAN
 	tristate "Intel EG20T PCH CAN controller"
 	tristate "Intel EG20T PCH CAN controller"
-	depends on CAN_DEV && PCI
+	depends on PCI
 	---help---
 	---help---
 	  This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which
 	  This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which
 	  is an IOH for x86 embedded processor (Intel Atom E6xx series).
 	  is an IOH for x86 embedded processor (Intel Atom E6xx series).
@@ -108,7 +109,7 @@ config PCH_CAN
 
 
 config CAN_GRCAN
 config CAN_GRCAN
 	tristate "Aeroflex Gaisler GRCAN and GRHCAN CAN devices"
 	tristate "Aeroflex Gaisler GRCAN and GRHCAN CAN devices"
-	depends on CAN_DEV && OF
+	depends on OF
 	---help---
 	---help---
 	  Say Y here if you want to use Aeroflex Gaisler GRCAN or GRHCAN.
 	  Say Y here if you want to use Aeroflex Gaisler GRCAN or GRHCAN.
 	  Note that the driver supports little endian, even though little
 	  Note that the driver supports little endian, even though little
@@ -127,6 +128,8 @@ source "drivers/net/can/usb/Kconfig"
 
 
 source "drivers/net/can/softing/Kconfig"
 source "drivers/net/can/softing/Kconfig"
 
 
+endif
+
 config CAN_DEBUG_DEVICES
 config CAN_DEBUG_DEVICES
 	bool "CAN devices debugging messages"
 	bool "CAN devices debugging messages"
 	---help---
 	---help---

+ 1 - 1
drivers/net/can/c_can/Kconfig

@@ -1,6 +1,6 @@
 menuconfig CAN_C_CAN
 menuconfig CAN_C_CAN
 	tristate "Bosch C_CAN/D_CAN devices"
 	tristate "Bosch C_CAN/D_CAN devices"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 
 
 if CAN_C_CAN
 if CAN_C_CAN
 
 

+ 1 - 1
drivers/net/can/cc770/Kconfig

@@ -1,6 +1,6 @@
 menuconfig CAN_CC770
 menuconfig CAN_CC770
 	tristate "Bosch CC770 and Intel AN82527 devices"
 	tristate "Bosch CC770 and Intel AN82527 devices"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 
 
 if CAN_CC770
 if CAN_CC770
 
 

+ 1 - 1
drivers/net/can/mscan/Kconfig

@@ -1,5 +1,5 @@
 config CAN_MSCAN
 config CAN_MSCAN
-	depends on CAN_DEV && (PPC || M68K)
+	depends on PPC || M68K
 	tristate "Support for Freescale MSCAN based chips"
 	tristate "Support for Freescale MSCAN based chips"
 	---help---
 	---help---
 	  The Motorola Scalable Controller Area Network (MSCAN) definition
 	  The Motorola Scalable Controller Area Network (MSCAN) definition

+ 1 - 1
drivers/net/can/sja1000/Kconfig

@@ -1,6 +1,6 @@
 menuconfig CAN_SJA1000
 menuconfig CAN_SJA1000
 	tristate "Philips/NXP SJA1000 devices"
 	tristate "Philips/NXP SJA1000 devices"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 
 
 if CAN_SJA1000
 if CAN_SJA1000
 
 

+ 1 - 1
drivers/net/can/softing/Kconfig

@@ -1,6 +1,6 @@
 config CAN_SOFTING
 config CAN_SOFTING
 	tristate "Softing Gmbh CAN generic support"
 	tristate "Softing Gmbh CAN generic support"
-	depends on CAN_DEV && HAS_IOMEM
+	depends on HAS_IOMEM
 	---help---
 	---help---
 	  Support for CAN cards from Softing Gmbh & some cards
 	  Support for CAN cards from Softing Gmbh & some cards
 	  from Vector Gmbh.
 	  from Vector Gmbh.

+ 1 - 1
drivers/net/can/usb/Kconfig

@@ -1,5 +1,5 @@
 menu "CAN USB interfaces"
 menu "CAN USB interfaces"
-	depends on USB && CAN_DEV
+	depends on USB
 
 
 config CAN_EMS_USB
 config CAN_EMS_USB
 	tristate "EMS CPC-USB/ARM7 CAN/USB interface"
 	tristate "EMS CPC-USB/ARM7 CAN/USB interface"