Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp3411509pxf; Mon, 29 Mar 2021 01:14:13 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxparN2JvD15NgErDppndxr2t7ufhelWEm/4LdFwgbQ6yinpHUcNNeHBB8eVMn5j/Otk0m7 X-Received: by 2002:aa7:c0c7:: with SMTP id j7mr27405243edp.298.1617005653752; Mon, 29 Mar 2021 01:14:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617005653; cv=none; d=google.com; s=arc-20160816; b=bFaPWFhwMl34bkjdEm7Tsg3/9plR5ZG+3/eoy5yulYlgJ+0wUhIoHMxjDX9Hx+CUcp uZJfrGeP4IJA9gSm4+QHw2QWfrx65F9ZI5VMDYSwtJLwIlLlwGq8BgOrlToQiN5Os8AX 8Tl7Lsd62BFSgBxNR3lJhXHEFCSZjqsniLRVy+bvW+FhzcHnhasxr/Pm51LRYV/oskHM 1c3sD5z856+kxOPWskV2cVrXmRtape7Iw3gwO9cEc7kARVYJsxyM3XMK1OSKMOO92jo/ xmuEwF9U430LxiC9UlpRItFqdFQpaaNNjxbjwsWiOJOMoqL7/Id92Hhs7xhoy1MFrinG +MlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=mFC2ylBaT8rEL1ormixo65oOzjJzsNlRsSadw0ytClM=; b=XHLLRRr672DHCktLeoxNjN4eNy2rXKp2zLjJQ4XW45BRLpsj9JaSJcDRwzvGiUF40h J/ma0W4OMhmUmvy9jd9sGqhG5hc+YPjLt7NsEC17Dm926UNJVr5ZGlsOXCJ/+eEEnput i8iKE8VSr0ZMZ0p3a1N7gFHXoeYmO0H0f/QFRl2eT6nogjBxN5QS7LdQe6GowIQLnQyf MwCaohIDWxVcTyiTd5AbzhiLUn/tDCF8h+Q41oN6CS5HZaj3Mi2QqXULbfd3LLsHI+Ym BaewJjmH0GIbwllyBxVoLNbpaJwub4FOLTL6cTQ9tpn4EYa5NctfyeH3QzHXJltttiHU +uvA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FDF6sxhE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id gn42si13824701ejc.583.2021.03.29.01.13.51; Mon, 29 Mar 2021 01:14:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=FDF6sxhE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232003AbhC2ILj (ORCPT + 99 others); Mon, 29 Mar 2021 04:11:39 -0400 Received: from mail.kernel.org ([198.145.29.99]:49162 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232369AbhC2IGh (ORCPT ); Mon, 29 Mar 2021 04:06:37 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 1F3E661477; Mon, 29 Mar 2021 08:06:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617005196; bh=EOvfSR2zZnuuYQRmLsCwFvncGUc8rhfGvu4gbiiYr1M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FDF6sxhEadG7HrZJnwNF+mNUsLyGtF+65GjsWolQBSEsT22LuRVwSy3xmS4UAgagX cfBbnecwGh1jwU9cqIdH4U/shXnWUbpp0wrP5VtaqyXOuQbGxZJM7XHap8o1qZHl/5 VN1/hjmqqHm+/0HW+83xQ1TtbqMQrt8psd0kroVs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leon Romanovsky , Stephane Grosjean , Marc Kleine-Budde Subject: [PATCH 4.14 59/59] can: peak_usb: Revert "can: peak_usb: add forgotten supported devices" Date: Mon, 29 Mar 2021 09:58:39 +0200 Message-Id: <20210329075610.816474169@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210329075608.898173317@linuxfoundation.org> References: <20210329075608.898173317@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Marc Kleine-Budde 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 Cc: Stephane Grosjean Signed-off-by: Marc Kleine-Budde Signed-off-by: Greg Kroah-Hartman --- drivers/net/can/usb/peak_usb/pcan_usb_fd.c | 2 -- 1 file changed, 2 deletions(-) --- a/drivers/net/can/usb/peak_usb/pcan_usb_fd.c +++ b/drivers/net/can/usb/peak_usb/pcan_usb_fd.c @@ -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