Commit b707fabe authored Mar 20, 2021 by Marc Kleine-Budde Committed by Greg Kroah-Hartman Mar 30, 2021

can: peak_usb: Revert "can: peak_usb: add forgotten supported devices"

commit 5d7047ed6b7214fbabc16d8712a822e256b1aa44 upstream.

In commit 6417f03132a6 ("module: remove never implemented
MODULE_SUPPORTED_DEVICE") the MODULE_SUPPORTED_DEVICE macro was
removed from the kerne entirely. Shortly before this patch was applied
mainline the commit 59ec7b89ed3e ("can: peak_usb: add forgotten
supported devices") was added to net/master. As this would result in a
merge conflict, let's revert this patch.

Fixes: 59ec7b89ed3e ("can: peak_usb: add forgotten supported devices")
Link: https://lore.kernel.org/r/20210320192649.341832-1-mkl@pengutronix.de


Suggested-by: Leon Romanovsky <leon@kernel.org>
Cc: Stephane Grosjean <s.grosjean@peak-system.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 30e7160b

drivers/net/can/usb/peak_usb/pcan_usb_fd.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -26,8 +26,6 @@

		MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter");
		MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter");
		MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-Chip USB");
		MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB X6 adapter");

		#define PCAN_USBPROFD_CHANNEL_COUNT 2
		#define PCAN_USBFD_CHANNEL_COUNT 1