From patchwork Sat Nov 7 21:49:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 58400 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id nA7LndRC027501 for ; Sat, 7 Nov 2009 21:49:46 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753359AbZKGVtj (ORCPT ); Sat, 7 Nov 2009 16:49:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753352AbZKGVtj (ORCPT ); Sat, 7 Nov 2009 16:49:39 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:42339 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753316AbZKGVtj convert rfc822-to-8bit (ORCPT ); Sat, 7 Nov 2009 16:49:39 -0500 Received: from deadeye.i.decadent.org.uk ([192.168.4.185] helo=localhost) by shadbolt.decadent.org.uk with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1N6tAF-0003CR-I4; Sat, 07 Nov 2009 21:49:44 +0000 Received: from womble by localhost with local (Exim 4.69) (envelope-from ) id 1N6tAD-0007I2-UC; Sat, 07 Nov 2009 21:49:42 +0000 From: Ben Hutchings To: Mauro Carvalho Chehab Cc: linux-media Date: Sat, 07 Nov 2009 21:49:41 +0000 Message-ID: <1257630581.15927.408.camel@localhost> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-SA-Exim-Connect-IP: 192.168.4.185 X-SA-Exim-Mail-From: ben@decadent.org.uk X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on shadbolt.decadent.org.uk X-Spam-Level: X-Spam-Status: No, score=-1.4 required=5.0 tests=ALL_TRUSTED autolearn=disabled version=3.2.5 Subject: [PATCH 16/75] drx397xD: declare MODULE_FIRMWARE X-SA-Exim-Version: 4.2.1 (built Wed, 25 Jun 2008 17:14:11 +0000) X-SA-Exim-Scanned: Yes (on shadbolt.decadent.org.uk) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index 868b78b..4f4c403 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c @@ -39,7 +39,7 @@ static const char mod_name[] = "drx397xD"; #define F_SET_0D4h 2 enum fw_ix { -#define _FW_ENTRY(a, b, c) b +#define _FW_ENTRY(a, b, c) b, #include "drx397xD_fw.h" }; @@ -77,7 +77,7 @@ static struct { .file = NULL, \ .lock = __RW_LOCK_UNLOCKED(fw[c].lock), \ .refcnt = 0, \ - .data = { } } + .data = { } }, #include "drx397xD_fw.h" }; @@ -1507,4 +1507,5 @@ EXPORT_SYMBOL(drx397xD_attach); MODULE_DESCRIPTION("Micronas DRX397xD DVB-T Frontend"); MODULE_AUTHOR("Henk Vergonet"); MODULE_LICENSE("GPL"); - +#define _FW_ENTRY(a, b, c) MODULE_FIRMWARE(a); +#include "drx397xD_fw.h" diff --git a/drivers/media/dvb/frontends/drx397xD_fw.h b/drivers/media/dvb/frontends/drx397xD_fw.h index c8b44c1..f0260ad 100644 --- a/drivers/media/dvb/frontends/drx397xD_fw.h +++ b/drivers/media/dvb/frontends/drx397xD_fw.h @@ -18,8 +18,8 @@ */ #ifdef _FW_ENTRY - _FW_ENTRY("drx397xD.A2.fw", DRXD_FW_A2 = 0, DRXD_FW_A2 ), - _FW_ENTRY("drx397xD.B1.fw", DRXD_FW_B1, DRXD_FW_B1 ), + _FW_ENTRY("drx397xD.A2.fw", DRXD_FW_A2 = 0, DRXD_FW_A2 ) + _FW_ENTRY("drx397xD.B1.fw", DRXD_FW_B1, DRXD_FW_B1 ) #undef _FW_ENTRY #endif /* _FW_ENTRY */