Takashi Iwai ce12f1
From 5d7047ed6b7214fbabc16d8712a822e256b1aa44 Mon Sep 17 00:00:00 2001
Takashi Iwai ce12f1
From: Marc Kleine-Budde <mkl@pengutronix.de>
Takashi Iwai ce12f1
Date: Sat, 20 Mar 2021 20:21:54 +0100
Takashi Iwai ce12f1
Subject: [PATCH] can: peak_usb: Revert "can: peak_usb: add forgotten supported devices"
Takashi Iwai ce12f1
Git-commit: 5d7047ed6b7214fbabc16d8712a822e256b1aa44
Takashi Iwai ce12f1
Patch-mainline: v5.12-rc5
Takashi Iwai ce12f1
References: git-fixes
Takashi Iwai ce12f1
Takashi Iwai ce12f1
In commit 6417f03132a6 ("module: remove never implemented
Takashi Iwai ce12f1
MODULE_SUPPORTED_DEVICE") the MODULE_SUPPORTED_DEVICE macro was
Takashi Iwai ce12f1
removed from the kerne entirely. Shortly before this patch was applied
Takashi Iwai ce12f1
mainline the commit 59ec7b89ed3e ("can: peak_usb: add forgotten
Takashi Iwai ce12f1
supported devices") was added to net/master. As this would result in a
Takashi Iwai ce12f1
merge conflict, let's revert this patch.
Takashi Iwai ce12f1
Takashi Iwai ce12f1
Fixes: 59ec7b89ed3e ("can: peak_usb: add forgotten supported devices")
Takashi Iwai ce12f1
Link: https://lore.kernel.org/r/20210320192649.341832-1-mkl@pengutronix.de
Takashi Iwai ce12f1
Suggested-by: Leon Romanovsky <leon@kernel.org>
Takashi Iwai ce12f1
Cc: Stephane Grosjean <s.grosjean@peak-system.com>
Takashi Iwai ce12f1
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Takashi Iwai ce12f1
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai ce12f1
Takashi Iwai ce12f1
---
Takashi Iwai ce12f1
 drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 --
Takashi Iwai ce12f1
 1 file changed, 2 deletions(-)
Takashi Iwai ce12f1
Takashi Iwai ce12f1
diff --git a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
Takashi Iwai ce12f1
index f1d018218c93..f347ecc79aef 100644
Takashi Iwai ce12f1
--- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
Takashi Iwai ce12f1
+++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c
Takashi Iwai ce12f1
@@ -18,8 +18,6 @@
Takashi Iwai ce12f1
 
Takashi Iwai ce12f1
 MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB FD adapter");
Takashi Iwai ce12f1
 MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB Pro FD adapter");
Takashi Iwai ce12f1
-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-Chip USB");
Takashi Iwai ce12f1
-MODULE_SUPPORTED_DEVICE("PEAK-System PCAN-USB X6 adapter");
Takashi Iwai ce12f1
 
Takashi Iwai ce12f1
 #define PCAN_USBPROFD_CHANNEL_COUNT	2
Takashi Iwai ce12f1
 #define PCAN_USBFD_CHANNEL_COUNT	1
Takashi Iwai ce12f1
-- 
Takashi Iwai ce12f1
2.26.2
Takashi Iwai ce12f1