Skip to content

Commit

Permalink
can: Kconfig: convert 'depends on CAN_DEV' into 'if CAN_DEV...endif' …
Browse files Browse the repository at this point in the history
…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>
  • Loading branch information
Marc Kleine-Budde committed Jan 26, 2013
1 parent 7713683 commit 6586c5d
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 15 deletions.
21 changes: 12 additions & 9 deletions drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,10 @@ config CAN_DEV
support. This is the standard library for CAN drivers.
If unsure, say Y.

if CAN_DEV

config CAN_CALC_BITTIMING
bool "CAN bit-timing calculation"
depends on CAN_DEV
default y
---help---
If enabled, CAN bit-timing parameters will be calculated for the
Expand All @@ -52,26 +53,26 @@ config CAN_CALC_BITTIMING

config CAN_AT91
tristate "Atmel AT91 onchip CAN controller"
depends on CAN_DEV && (ARCH_AT91SAM9263 || ARCH_AT91SAM9X5)
depends on ARCH_AT91SAM9263 || ARCH_AT91SAM9X5
---help---
This is a driver for the SoC CAN controller in Atmel's AT91SAM9263
and AT91SAM9X5 processors.

config CAN_TI_HECC
depends on CAN_DEV && ARCH_OMAP3
depends on ARCH_OMAP3
tristate "TI High End CAN Controller"
---help---
Driver for TI HECC (High End CAN Controller) module found on many
TI devices. The device specifications are available from www.ti.com

config CAN_MCP251X
tristate "Microchip MCP251x SPI CAN controllers"
depends on CAN_DEV && SPI && HAS_DMA
depends on SPI && HAS_DMA
---help---
Driver for the Microchip MCP251x SPI CAN controllers.

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"
---help---
Driver for the Analog Devices Blackfin on-chip CAN controllers
Expand All @@ -81,7 +82,7 @@ config CAN_BFIN

config CAN_JANZ_ICAN3
tristate "Janz VMOD-ICAN3 Intelligent CAN controller"
depends on CAN_DEV && MFD_JANZ_CMODIO
depends on MFD_JANZ_CMODIO
---help---
Driver for Janz VMOD-ICAN3 Intelligent CAN controller module, which
connects to a MODULbus carrier board.
Expand All @@ -94,21 +95,21 @@ config HAVE_CAN_FLEXCAN

config CAN_FLEXCAN
tristate "Support for Freescale FLEXCAN based chips"
depends on CAN_DEV && HAVE_CAN_FLEXCAN
depends on HAVE_CAN_FLEXCAN
---help---
Say Y here if you want to support for Freescale FlexCAN.

config PCH_CAN
tristate "Intel EG20T PCH CAN controller"
depends on CAN_DEV && PCI
depends on PCI
---help---
This driver is for PCH CAN of Topcliff (Intel EG20T PCH) which
is an IOH for x86 embedded processor (Intel Atom E6xx series).
This driver can access CAN bus.

config CAN_GRCAN
tristate "Aeroflex Gaisler GRCAN and GRHCAN CAN devices"
depends on CAN_DEV && OF
depends on OF
---help---
Say Y here if you want to use Aeroflex Gaisler GRCAN or GRHCAN.
Note that the driver supports little endian, even though little
Expand All @@ -127,6 +128,8 @@ source "drivers/net/can/usb/Kconfig"

source "drivers/net/can/softing/Kconfig"

endif

config CAN_DEBUG_DEVICES
bool "CAN devices debugging messages"
---help---
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/c_can/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
menuconfig CAN_C_CAN
tristate "Bosch C_CAN/D_CAN devices"
depends on CAN_DEV && HAS_IOMEM
depends on HAS_IOMEM

if CAN_C_CAN

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/cc770/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
menuconfig CAN_CC770
tristate "Bosch CC770 and Intel AN82527 devices"
depends on CAN_DEV && HAS_IOMEM
depends on HAS_IOMEM

if CAN_CC770

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/mscan/Kconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
config CAN_MSCAN
depends on CAN_DEV && (PPC || M68K)
depends on PPC || M68K
tristate "Support for Freescale MSCAN based chips"
---help---
The Motorola Scalable Controller Area Network (MSCAN) definition
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/sja1000/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
menuconfig CAN_SJA1000
tristate "Philips/NXP SJA1000 devices"
depends on CAN_DEV && HAS_IOMEM
depends on HAS_IOMEM

if CAN_SJA1000

Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/softing/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config CAN_SOFTING
tristate "Softing Gmbh CAN generic support"
depends on CAN_DEV && HAS_IOMEM
depends on HAS_IOMEM
---help---
Support for CAN cards from Softing Gmbh & some cards
from Vector Gmbh.
Expand Down
2 changes: 1 addition & 1 deletion drivers/net/can/usb/Kconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
menu "CAN USB interfaces"
depends on USB && CAN_DEV
depends on USB

config CAN_EMS_USB
tristate "EMS CPC-USB/ARM7 CAN/USB interface"
Expand Down

0 comments on commit 6586c5d

Please sign in to comment.