Skip to content

Commit

Permalink
net: Kconfig: move the CAN device menu to the "Device Drivers" section
Browse files Browse the repository at this point in the history
The devices are meant to be under the "Device Drivers" category of the
menuconfig. The CAN subsystem is currently one of the rare exception
with all of its devices under the "Networking support" category.

The CAN_DEV menuentry gets moved to fix this discrepancy. The CAN menu
is added just before MCTP in order to be consistent with the current
order under the "Networking support" menu.

A dependency on CAN is added to CAN_DEV so that the CAN devices only
show up if the CAN subsystem is enabled.

Link: https://lore.kernel.org/all/20220610143009.323579-6-mailhol.vincent@wanadoo.fr
Signed-off-by: Vincent Mailhol <mailhol.vincent@wanadoo.fr>
Acked-by: Max Staudt <max@enpas.org>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Vincent Mailhol authored and Marc Kleine-Budde committed Jun 11, 2022
1 parent bfe0092 commit d7786af
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/net/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -499,6 +499,8 @@ config NET_SB1000

source "drivers/net/phy/Kconfig"

source "drivers/net/can/Kconfig"

source "drivers/net/mctp/Kconfig"

source "drivers/net/mdio/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
menuconfig CAN_DEV
tristate "CAN Device Drivers"
default y
depends on CAN
help
Controller Area Network (CAN) is serial communications protocol up to
1Mbit/s for its original release (now known as Classical CAN) and up
Expand Down
5 changes: 2 additions & 3 deletions net/can/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ menuconfig CAN
PF_CAN is contained in <Documentation/networking/can.rst>.

If you want CAN support you should say Y here and also to the
specific driver for your controller(s) below.
specific driver for your controller(s) under the Network device
support section.

if CAN

Expand Down Expand Up @@ -69,6 +70,4 @@ config CAN_ISOTP
If you want to perform automotive vehicle diagnostic services (UDS),
say 'y'.

source "drivers/net/can/Kconfig"

endif

0 comments on commit d7786af

Please sign in to comment.