From patchwork Sat Nov 7 21:51:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 58413 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 nA7LpJNo027852 for ; Sat, 7 Nov 2009 21:51:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753435AbZKGVvT (ORCPT ); Sat, 7 Nov 2009 16:51:19 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753431AbZKGVvT (ORCPT ); Sat, 7 Nov 2009 16:51:19 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:42381 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753428AbZKGVvS convert rfc822-to-8bit (ORCPT ); Sat, 7 Nov 2009 16:51:18 -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 1N6tBq-0003Ds-Qd; Sat, 07 Nov 2009 21:51:23 +0000 Received: from womble by localhost with local (Exim 4.69) (envelope-from ) id 1N6tBp-0007NY-P4; Sat, 07 Nov 2009 21:51:21 +0000 From: Ben Hutchings To: Mauro Carvalho Chehab Cc: linux-media Date: Sat, 07 Nov 2009 21:51:21 +0000 Message-ID: <1257630681.15927.423.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,AWL autolearn=disabled version=3.2.5 Subject: [PATCH 29/75] cx18: 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/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c index b9e8cc5..137445c 100644 --- a/drivers/media/video/cx18/cx18-av-firmware.c +++ b/drivers/media/video/cx18/cx18-av-firmware.c @@ -32,6 +32,7 @@ #define CX18_AI1_MUX_INVALID 0x30 #define FWFILE "v4l-cx23418-dig.fw" +MODULE_FIRMWARE(FWFILE); static int cx18_av_verifyfw(struct cx18 *cx, const struct firmware *fw) { diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c index 51a0c33..9f70168 100644 --- a/drivers/media/video/cx18/cx18-dvb.c +++ b/drivers/media/video/cx18/cx18-dvb.c @@ -131,6 +131,8 @@ static int yuan_mpc718_mt352_reqfw(struct cx18_stream *stream, return ret; } +MODULE_FIRMWARE("dvb-cx18-mpc718-mt352.fw"); + static int yuan_mpc718_mt352_init(struct dvb_frontend *fe) { struct cx18_dvb *dvb = container_of(fe->dvb, diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c index 83cd559..4ac4b81 100644 --- a/drivers/media/video/cx18/cx18-firmware.c +++ b/drivers/media/video/cx18/cx18-firmware.c @@ -446,3 +446,6 @@ int cx18_firmware_init(struct cx18 *cx) cx18_write_reg_expect(cx, 0x14001400, 0xc78110, 0x00001400, 0x14001400); return 0; } + +MODULE_FIRMWARE("v4l-cx23418-cpu.fw"); +MODULE_FIRMWARE("v4l-cx23418-apu.fw");