Skip to content

Commit d7786af

Browse files
vincent-mailholmarckleinebudde
authored andcommitted
net: Kconfig: move the CAN device menu to the "Device Drivers" section
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/[email protected] Signed-off-by: Vincent Mailhol <[email protected]> Acked-by: Max Staudt <[email protected]> Tested-by: Oliver Hartkopp <[email protected]> Signed-off-by: Marc Kleine-Budde <[email protected]>
1 parent bfe0092 commit d7786af

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

drivers/net/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,8 @@ config NET_SB1000
499499

500500
source "drivers/net/phy/Kconfig"
501501

502+
source "drivers/net/can/Kconfig"
503+
502504
source "drivers/net/mctp/Kconfig"
503505

504506
source "drivers/net/mdio/Kconfig"

drivers/net/can/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
menuconfig CAN_DEV
44
tristate "CAN Device Drivers"
55
default y
6+
depends on CAN
67
help
78
Controller Area Network (CAN) is serial communications protocol up to
89
1Mbit/s for its original release (now known as Classical CAN) and up

net/can/Kconfig

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ menuconfig CAN
1515
PF_CAN is contained in <Documentation/networking/can.rst>.
1616

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

2021
if CAN
2122

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

72-
source "drivers/net/can/Kconfig"
73-
7473
endif

0 commit comments

Comments
 (0)