2018-12-14 09:45:28

by Alexander Dahl

[permalink] [raw]
Subject: [PATCH] can: usb: Kconfig: Remove duplicate menu entry

This seems to have slipped in by accident when sorting the entries.

Fixes: ffbdd9172ee2f53020f763574b4cdad8d9760a4f
Signed-off-by: Alexander Dahl <[email protected]>
---
drivers/net/can/usb/Kconfig | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index 750d04d9e2ae..928bf083f8d2 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -101,12 +101,6 @@ config CAN_PEAK_USB

(see also http://www.peak-system.com).

-config CAN_MCBA_USB
- tristate "Microchip CAN BUS Analyzer interface"
- ---help---
- This driver supports the CAN BUS Analyzer interface
- from Microchip (http://www.microchip.com/development-tools/).
-
config CAN_UCAN
tristate "Theobroma Systems UCAN interface"
---help---
--
2.11.0



2019-01-22 14:05:09

by Alexander Dahl

[permalink] [raw]
Subject: [PATCH v2] can: usb: Kconfig: Remove duplicate menu entry

This seems to have slipped in by accident when sorting the entries.

Fixes: ffbdd9172ee2f53020f763574b4cdad8d9760a4f
Signed-off-by: Alexander Dahl <[email protected]>
---

Notes:
v1 -> v2:
* rebase onto v5.0-rc3 (was v4.20-rc6)

drivers/net/can/usb/Kconfig | 6 ------
1 file changed, 6 deletions(-)

diff --git a/drivers/net/can/usb/Kconfig b/drivers/net/can/usb/Kconfig
index 750d04d9e2ae..928bf083f8d2 100644
--- a/drivers/net/can/usb/Kconfig
+++ b/drivers/net/can/usb/Kconfig
@@ -101,12 +101,6 @@ config CAN_PEAK_USB

(see also http://www.peak-system.com).

-config CAN_MCBA_USB
- tristate "Microchip CAN BUS Analyzer interface"
- ---help---
- This driver supports the CAN BUS Analyzer interface
- from Microchip (http://www.microchip.com/development-tools/).
-
config CAN_UCAN
tristate "Theobroma Systems UCAN interface"
---help---
--
2.11.0


2019-01-22 14:02:52

by Marc Kleine-Budde

[permalink] [raw]
Subject: Re: [PATCH v2] can: usb: Kconfig: Remove duplicate menu entry

On 1/22/19 2:55 PM, Alexander Dahl wrote:
> This seems to have slipped in by accident when sorting the entries.
>
> Fixes: ffbdd9172ee2f53020f763574b4cdad8d9760a4f
> Signed-off-by: Alexander Dahl <[email protected]>

Added to linux-can.

Tnx,
Marc

--
Pengutronix e.K. | Marc Kleine-Budde |
Industrial Linux Solutions | Phone: +49-231-2826-924 |
Vertretung West/Dortmund | Fax: +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de |

Attachments:
signature.asc (499.00 B)
OpenPGP digital signature