From patchwork Sun Dec 9 15:14:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1009997 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="BBk3487k"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43CVGm6sTGz9s3q for ; Mon, 10 Dec 2018 02:18:56 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Subject:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vya/UDrlQVyKjDB6yR72nISpSNM1v0ILoAwrvxGHpvw=; b=BBk3487kREm3/i zTjUMRrFcgIh9cc40kqdERqDfFtvUOy2GP8wpLkFVmpRTnmPBpfNlN728zzknrsPG6+9/Z1SCR7bQ KxUWYPHejT8Z8VpAugX0pcoQWsF7n+xQIg/ojphmKxakKwyHu1cex8NhJBbdcwKJcnwsOD7JEDbIc mhKl51s2FLJLrzPWde4dBvtWrjf6CzWNqH6RWYbbadI5u8bSrpF3SfjIrDY4E0CTSQUqmHJ29/jE2 og+o8c734dCNa9iVurfPW4w67QuBB7TifSrN+ZW8t3UNvSjkMrDVXyM6WpoNX6qER+YmQ2YDy2ygw +VpuhDRKTo94CRDpgEPA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW0r7-0000un-2z; Sun, 09 Dec 2018 15:18:53 +0000 Received: from mx1.mailbox.org ([2001:67c:2050:104:0:1:25:1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gW0nx-0005rb-Bd for openwrt-devel@lists.openwrt.org; Sun, 09 Dec 2018 15:15:49 +0000 Received: from smtp2.mailbox.org (smtp2.mailbox.org [80.241.60.241]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id 019CC447CA; Sun, 9 Dec 2018 16:15:15 +0100 (CET) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp2.mailbox.org ([80.241.60.241]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id ir6lOKU_K6yp; Sun, 9 Dec 2018 16:15:14 +0100 (CET) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Sun, 9 Dec 2018 16:14:33 +0100 Message-Id: <20181209151451.8831-12-hauke@hauke-m.de> In-Reply-To: <20181209151451.8831-1-hauke@hauke-m.de> References: <20181209151451.8831-1-hauke@hauke-m.de> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181209_071538_381769_83BB102D X-CRM114-Status: GOOD ( 11.51 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [2001:67c:2050:104:0:1:25:1 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 11/29] kernel: Adapt to moved kvaser_usb.ko in kernel 4.19 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Hauke Mehrtens MIME-Version: 1.0 Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org In kernel 4.19 the kvaser_usb.ko file moved into its own directory. Signed-off-by: Hauke Mehrtens --- package/kernel/linux/modules/can.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/kernel/linux/modules/can.mk b/package/kernel/linux/modules/can.mk index 925de4d8a5..4154ceba72 100644 --- a/package/kernel/linux/modules/can.mk +++ b/package/kernel/linux/modules/can.mk @@ -231,7 +231,9 @@ $(eval $(call KernelPackage,can-usb-esd)) define KernelPackage/can-usb-kvaser TITLE:=Kvaser CAN/USB interface KCONFIG:=CONFIG_CAN_KVASER_USB - FILES:=$(LINUX_DIR)/drivers/net/can/usb/kvaser_usb.ko + FILES:= \ + $(LINUX_DIR)/drivers/net/can/usb/kvaser_usb.ko@lt4.19 \ + $(LINUX_DIR)/drivers/net/can/usb/kvaser_usb/kvaser_usb.ko@ge4.19 AUTOLOAD:=$(call AutoProbe,kvaser_usb) $(call AddDepends/can,+kmod-usb-core) endef