From patchwork Thu May 3 22:22:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Poirier X-Patchwork-Id: 10989 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SQ4Qb-0005vX-Ss for patchwork@linuxtv.org; Fri, 04 May 2012 00:23:13 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-2) with esmtp for id 1SQ4Qb-00062r-Gv; Fri, 04 May 2012 00:23:13 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758952Ab2ECWXL (ORCPT ); Thu, 3 May 2012 18:23:11 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:42282 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758923Ab2ECWWi (ORCPT ); Thu, 3 May 2012 18:22:38 -0400 Received: by mail-pz0-f46.google.com with SMTP id y13so2478171dad.5 for ; Thu, 03 May 2012 15:22:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=tG+u+Yi5k/6C26yqf/9tR5Clsdxu+yCxRE4YVjXGV60=; b=ILsuxuj01sT3gDKG+GLw09TyrJIwCjcAmQgLgLZjotJVhTS2d1FecMNs2mcgCy/xET Ie+n54bdhJKdsaRLyX/0SqFrN9hONGExtz+sne7p1oSGr+AbXvGH+Z1fRBSS2ppozAxA HYoxC0BJgoOtXX1en3bHf9Di3mqXPvArkxBdO/4jwNv/XHgTklZxZ0iwqUVyQJzoeyDi DMlWSjW1Y1HKC9HLx4305qB0CQvG6lXu5QhRPXQd9VaMUu9Yc5Dix0Z+euqE1l49Cea9 PRGnvtiViDrBXL2HNXJx8vE1VRIaPLnnrsAZM6BZIFfKs/9FG2H/KpBpwCBzw6+gEWIk v3Tw== Received: by 10.68.230.132 with SMTP id sy4mr12179086pbc.75.1336083758329; Thu, 03 May 2012 15:22:38 -0700 (PDT) Received: from localhost.localdomain (S0106002369de4dac.cg.shawcable.net. [70.73.24.112]) by mx.google.com with ESMTPS id kl2sm2639359pbc.19.2012.05.03.15.22.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 May 2012 15:22:37 -0700 (PDT) From: mathieu.poirier@linaro.org To: mchehab@infradead.org Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org, arnd@arndb.de, mathieu.poirier@linaro.org Subject: [PATCH 5/6] dvb/drxd: stub out drxd_attach when not built Date: Thu, 3 May 2012 16:22:26 -0600 Message-Id: <1336083747-3142-6-git-send-email-mathieu.poirier@linaro.org> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1336083747-3142-1-git-send-email-mathieu.poirier@linaro.org> References: <1336083747-3142-1-git-send-email-mathieu.poirier@linaro.org> X-Gm-Message-State: ALoCoQnc+NgGHkgnTTG2b06lu0Wowv5K6CtsAyHYY5wXZaJ44LqNiNuyHrTbo6GL0jcDVLnJCnip Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.5.3.221217 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1400_1499 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, NO_REAL_NAME 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MULTIPLE_RCPTS_CC_X2 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: Arnd Bergmann This avoids getting drivers/media/video/em28xx/em28xx-dvb.c:721: \ undefined reference to `drxd_attach' Signed-off-by: Arnd Bergmann Signed-off-by: Mathieu Poirier --- drivers/media/dvb/frontends/drxd.h | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/media/dvb/frontends/drxd.h b/drivers/media/dvb/frontends/drxd.h index 3439873..216c8c3 100644 --- a/drivers/media/dvb/frontends/drxd.h +++ b/drivers/media/dvb/frontends/drxd.h @@ -51,9 +51,23 @@ struct drxd_config { s16(*osc_deviation) (void *priv, s16 dev, int flag); }; +#if defined(CONFIG_DVB_DRXD) || \ + (defined(CONFIG_DVB_DRXD_MODULE) && defined(MODULE)) extern struct dvb_frontend *drxd_attach(const struct drxd_config *config, void *priv, struct i2c_adapter *i2c, struct device *dev); +#else +static inline +struct dvb_frontend *drxd_attach(const struct drxd_config *config, + void *priv, struct i2c_adapter *i2c, + struct device *dev) +{ + printk(KERN_INFO "%s: not probed - driver disabled by Kconfig\n", + __func__); + return NULL; +} +#endif + extern int drxd_config_i2c(struct dvb_frontend *, int); #endif