From patchwork Wed Dec 10 13:00:36 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Geyer X-Patchwork-Id: 419650 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5B6701400DE for ; Thu, 11 Dec 2014 00:02:46 +1100 (AEDT) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 4971D28C1C4; Wed, 10 Dec 2014 13:59:49 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 776ED28C1E1 for ; Wed, 10 Dec 2014 13:59:07 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_FROM_MX=-3.1; rate: -7.6 Received: from mail.cosmopool.net (h1.radempa.de [176.9.142.194]) by arrakis.dune.hu (Postfix) with ESMTP for ; Wed, 10 Dec 2014 13:59:05 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail.cosmopool.net (Postfix) with ESMTP id B8D33903FFA; Wed, 10 Dec 2014 14:00:49 +0100 (CET) Received: from mail.cosmopool.net ([127.0.0.1]) by localhost (mail.your-server.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hhGiCLLOhs8c; Wed, 10 Dec 2014 14:00:49 +0100 (CET) Received: from stardust.g4.wien.funkfeuer.at (46.57.47.225.wireless.dyn.drei.com [46.57.47.225]) by mail.cosmopool.net (Postfix) with ESMTPSA id D3A5C902418; Wed, 10 Dec 2014 14:00:48 +0100 (CET) Received: from lambda (helo=stardust.g4.wien.funkfeuer.at) by stardust.g4.wien.funkfeuer.at with local-esmtp (Exim 4.80) (envelope-from ) id 1Xygse-00013d-Fg; Wed, 10 Dec 2014 14:00:36 +0100 From: Harald Geyer To: Zoltan HERPAI MIME-Version: 1.0 Content-ID: <4067.1418216435.1@stardust.g4.wien.funkfeuer.at> Date: Wed, 10 Dec 2014 14:00:36 +0100 Message-Id: Cc: openwrt-devel@lists.openwrt.org Subject: [OpenWrt-Devel] [PATCH, RESEND] kmod-iio-mxs-lradc: Don't include file also in kmod-iio-core X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Drop industrialio-triggered-buffer.ko from the package and depend on kmod-iio-core. Signed-off-by: Harald Geyer --- target/linux/mxs/modules.mk | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) This patch was already submitted a month ago (no answer yet). I'm resending because of the patchwork transition. This patch fixes a bug: kmod-iio-mxs-lradc and other kmod-iio-* packages can't be installed at the same time. diff --git a/target/linux/mxs/modules.mk b/target/linux/mxs/modules.mk index 3f9c8f8..4d95bf3 100644 --- a/target/linux/mxs/modules.mk +++ b/target/linux/mxs/modules.mk @@ -73,11 +73,10 @@ $(eval $(call KernelPackage,sound-soc-mxs)) define KernelPackage/iio-mxs-lradc SUBMENU:=$(OTHER_MENU) TITLE:=LRADC driver for i.MX23/28 - DEPENDS:=@TARGET_mxs + DEPENDS:=@TARGET_mxs +kmod-iio-core KCONFIG:=CONFIG_MXS_LRADC - FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/mxs-lradc.ko \ - $(LINUX_DIR)/drivers/iio/industrialio-triggered-buffer.ko - AUTOLOAD:=$(call AutoLoad,70,industrialio-triggered-buffer mxs-lradc) + FILES:=$(LINUX_DIR)/drivers/staging/iio/adc/mxs-lradc.ko + AUTOLOAD:=$(call AutoLoad,70,mxs-lradc) endef define KernelPackage/iio-mxs-lradc/description