From patchwork Sat Nov 7 21:51:55 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 58419 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 nA7LprcD027923 for ; Sat, 7 Nov 2009 21:51:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753468AbZKGVvx (ORCPT ); Sat, 7 Nov 2009 16:51:53 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753467AbZKGVvx (ORCPT ); Sat, 7 Nov 2009 16:51:53 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:42399 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460AbZKGVvw convert rfc822-to-8bit (ORCPT ); Sat, 7 Nov 2009 16:51:52 -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 1N6tCO-0003EP-GC; Sat, 07 Nov 2009 21:51:57 +0000 Received: from womble by localhost with local (Exim 4.69) (envelope-from ) id 1N6tCN-0007Q3-EP; Sat, 07 Nov 2009 21:51:55 +0000 From: Ben Hutchings To: Mauro Carvalho Chehab Cc: linux-media Date: Sat, 07 Nov 2009 21:51:55 +0000 Message-ID: <1257630715.15927.431.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 35/75] pvrusb2: 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/pvrusb2/pvrusb2-devattr.c b/drivers/media/video/pvrusb2/pvrusb2-devattr.c index e4d7c13..aa65a8d 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-devattr.c +++ b/drivers/media/video/pvrusb2/pvrusb2-devattr.c @@ -56,6 +56,7 @@ static const struct pvr2_device_client_desc pvr2_cli_29xxx[] = { static const char *pvr2_fw1_names_29xxx[] = { "v4l-pvrusb2-29xxx-01.fw", }; +MODULE_FIRMWARE("v4l-pvrusb2-29xxx-01.fw"); static const struct pvr2_device_desc pvr2_device_29xxx = { .description = "WinTV PVR USB2 Model Category 29xxx", @@ -89,6 +90,7 @@ static const struct pvr2_device_client_desc pvr2_cli_24xxx[] = { static const char *pvr2_fw1_names_24xxx[] = { "v4l-pvrusb2-24xxx-01.fw", }; +MODULE_FIRMWARE("v4l-pvrusb2-24xxx-01.fw"); static const struct pvr2_device_desc pvr2_device_24xxx = { .description = "WinTV PVR USB2 Model Category 24xxx", @@ -338,6 +340,7 @@ static const struct pvr2_device_client_desc pvr2_cli_73xxx[] = { static const char *pvr2_fw1_names_73xxx[] = { "v4l-pvrusb2-73xxx-01.fw", }; +MODULE_FIRMWARE("v4l-pvrusb2-73xxx-01.fw"); static const struct pvr2_device_desc pvr2_device_73xxx = { .description = "WinTV HVR-1900 Model Category 73xxx", @@ -443,6 +446,7 @@ static const struct pvr2_dvb_props pvr2_751xx_dvb_props = { static const char *pvr2_fw1_names_75xxx[] = { "v4l-pvrusb2-73xxx-01.fw", }; +MODULE_FIRMWARE("v4l-pvrusb2-73xxx-01.fw"); static const struct pvr2_device_desc pvr2_device_750xx = { .description = "WinTV HVR-1950 Model Category 750xx", diff --git a/drivers/media/video/pvrusb2/pvrusb2-hdw.c b/drivers/media/video/pvrusb2/pvrusb2-hdw.c index 4c1a2a5..97a6713 100644 --- a/drivers/media/video/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/video/pvrusb2/pvrusb2-hdw.c @@ -1674,6 +1674,7 @@ int pvr2_upload_firmware2(struct pvr2_hdw *hdw) return ret; } +MODULE_FIRMWARE(CX2341X_FIRM_ENC_FILENAME); static const char *pvr2_get_state_name(unsigned int st) {