From patchwork Tue Jul 19 08:10:12 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 9236313 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 39CBC600CB for ; Tue, 19 Jul 2016 08:11:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C30B2026B for ; Tue, 19 Jul 2016 08:11:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 202A52094F; Tue, 19 Jul 2016 08:11:26 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8DADC2026B for ; Tue, 19 Jul 2016 08:11:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752918AbcGSILA (ORCPT ); Tue, 19 Jul 2016 04:11:00 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:49983 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752832AbcGSIK6 (ORCPT ); Tue, 19 Jul 2016 04:10:58 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0M3B8p-1b6nUv0nvr-00swHn; Tue, 19 Jul 2016 10:10:46 +0200 From: Arnd Bergmann To: Mauro Carvalho Chehab Cc: Arnd Bergmann , Greg Kroah-Hartman , Hans Verkuil , linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/2] [media] staging: add MEDIA_SUPPORT dependency Date: Tue, 19 Jul 2016 10:10:12 +0200 Message-Id: <20160719081040.2685845-1-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 X-Provags-ID: V03:K0:e6gpbKFDJ/jeoQX+lti2l+rxvo0vpcw6goC+gRHMJX7OoU4BlVx CL1pfBdCzsXKwv5u3s18gSlsFML8kt7DIa0xyxeKp+kF+EXA06B7klOWioRHaZMdF3msSwU 4jmDplIz7ByUvRTybY92E5arMUM7oC5bZ6vPhAuk21cscUVNhS2GIPZLkr/3KwUxLSinf/5 nPhLY8nfmCdKwMASo+nGA== X-UI-Out-Filterresults: notjunk:1; V01:K0:rBjaZAETv0s=:VpXA/nVO9rF2UCx+HO9T53 S6B2hqAiHwZhcXMMv29wfQf11Es27FEIfDVXtYxNUE4zuogKp7bX749eFFM9xpmIXwFH3WcVK 4gzPN+qKYs06F7tWYZ+aHJYs5fPKLINs/gFRhQ05DykfBdMJuach3q5jxDVcDSG+CmgQ1Gy4H zFtNjkqEIwQoXz+A8q21ts1XvIi3UWkpF8wFQbPTSZgyXzh5OLzf3S5EHPypTkU4dzClySHX/ vsHJwxS3QOyifMn8ervFoVidylWOQ6b/4tBWKdSYk5UGwG+jhycQDq58R4BscHFaHQfuV9FqR foD315sttZv6DLkRdxKPSq3MDOt5XwW4qkqNQ77Nm7L8xO3GETWo6Ijh6XMa5kSSTpeG5NNa5 aJsG0Wvl4YTzTd+lQIv9bJ4UgJrNFB4V8G7d6jLOoCXp/xHFygvyBqpqeCYYzkYWjnS/IrIFe JYRwOgf32g7hP4I7TNQyJ501hph4CBYUU6U0RjiLuHxLdnaV3uVEReyVQA60HsWtJHId/pqrQ vrDc4qYRjfYbhQ/5jMkcxTGFGqxuzn71jIoA/MpTwLlz/ri7Pj4Q81NmsdFvQXRrySHvrplWJ gRS2XBNoSu9hdbpqprEM3L6xWZ2ohkPiA/5HfiZOy/nXNkd/cNR5+W2uzGzWM9Kpa2MmEV6mH Mj+QHiIVFMyY5CoEO9x8hTB4XeYeD6FG93j0MpfiCwsTR+ORjFEMl7GiDpNRBqjIJgL0= Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP staging media drivers tend to have a build time dependency on the media support. In particular, the newly added pulse8 cec driver can only be a loadable module if MEDIA_SUPPORT=m, but its build dependency is on a 'bool' symbol (MEDIA_CEC), so a randconfig build can fail with pulse8_cec built-in: drivers/staging/built-in.o: In function `pulse8_disconnect': dgnc_utils.c:(.text+0x114): undefined reference to `cec_unregister_adapter' drivers/staging/built-in.o: In function `pulse8_irq_work_handler': dgnc_utils.c:(.text+0x1bc): undefined reference to `cec_transmit_done' dgnc_utils.c:(.text+0x1d8): undefined reference to `cec_received_msg' dgnc_utils.c:(.text+0x1f4): undefined reference to `cec_transmit_done' dgnc_utils.c:(.text+0x218): undefined reference to `cec_transmit_done' dgnc_utils.c:(.text+0x23c): undefined reference to `cec_transmit_done' drivers/staging/built-in.o: In function `pulse8_connect': dgnc_utils.c:(.text+0x844): undefined reference to `cec_allocate_adapter' dgnc_utils.c:(.text+0x8a4): undefined reference to `cec_delete_adapter' dgnc_utils.c:(.text+0xa10): undefined reference to `cec_register_adapter' Originally, MEDIA_CEC itself was a tristate symbol, which would have prevented this, but since 5bb2399a4fe4 ("[media] cec: fix Kconfig dependency problems"), it doesn't work like that any more. This encloses all of the staging media drivers in a CONFIG_MEDIA_SUPPORT dependency in Kconfig, which solves the problem by enforcing that none of the drivers can be built-in if the media core is a module. Signed-off-by: Arnd Bergmann --- drivers/staging/media/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/media/Kconfig b/drivers/staging/media/Kconfig index cae42e56f270..7292f23954df 100644 --- a/drivers/staging/media/Kconfig +++ b/drivers/staging/media/Kconfig @@ -16,7 +16,7 @@ menuconfig STAGING_MEDIA If in doubt, say N here. -if STAGING_MEDIA +if STAGING_MEDIA && MEDIA_SUPPORT # Please keep them in alphabetic order source "drivers/staging/media/bcm2048/Kconfig"