From patchwork Sat Nov 7 21:51:32 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 58415 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 nA7LpVDg027876 for ; Sat, 7 Nov 2009 21:51:37 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753442AbZKGVvb (ORCPT ); Sat, 7 Nov 2009 16:51:31 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753440AbZKGVvb (ORCPT ); Sat, 7 Nov 2009 16:51:31 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:42387 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753431AbZKGVva convert rfc822-to-8bit (ORCPT ); Sat, 7 Nov 2009 16:51:30 -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 1N6tC2-0003E3-Tb; Sat, 07 Nov 2009 21:51:35 +0000 Received: from womble by localhost with local (Exim 4.69) (envelope-from ) id 1N6tC1-0007OK-9Z; Sat, 07 Nov 2009 21:51:33 +0000 From: Ben Hutchings To: Mauro Carvalho Chehab Cc: linux-media Date: Sat, 07 Nov 2009 21:51:32 +0000 Message-ID: <1257630692.15927.425.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 31/75] cx25840: 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/cx25840/cx25840-firmware.c b/drivers/media/video/cx25840/cx25840-firmware.c index 8150200..6dd9253 100644 --- a/drivers/media/video/cx25840/cx25840-firmware.c +++ b/drivers/media/video/cx25840/cx25840-firmware.c @@ -73,6 +73,9 @@ static const char *get_fw_name(struct i2c_client *client) return "v4l-cx231xx-avcore-01.fw"; return "v4l-cx25840.fw"; } +MODULE_FIRMWARE("v4l-cx23885-avcore-01.fw"); +MODULE_FIRMWARE("v4l-cx231xx-avcore-01.fw"); +MODULE_FIRMWARE("v4l-cx25840.fw"); static int check_fw_load(struct i2c_client *client, int size) {