From patchwork Sat Nov 7 21:51:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ben Hutchings X-Patchwork-Id: 58418 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 nA7LprcC027923 for ; Sat, 7 Nov 2009 21:51:54 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753464AbZKGVvr (ORCPT ); Sat, 7 Nov 2009 16:51:47 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753460AbZKGVvr (ORCPT ); Sat, 7 Nov 2009 16:51:47 -0500 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:42396 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753455AbZKGVvq convert rfc822-to-8bit (ORCPT ); Sat, 7 Nov 2009 16:51:46 -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 1N6tCJ-0003EI-7j; Sat, 07 Nov 2009 21:51:51 +0000 Received: from womble by localhost with local (Exim 4.69) (envelope-from ) id 1N6tCI-0007Pc-1b; Sat, 07 Nov 2009 21:51:50 +0000 From: Ben Hutchings To: Mauro Carvalho Chehab Cc: linux-media Date: Sat, 07 Nov 2009 21:51:49 +0000 Message-ID: <1257630709.15927.428.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 34/75] ivtv: 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/ivtv/ivtv-firmware.c b/drivers/media/video/ivtv/ivtv-firmware.c index c1b7ec4..fd74d41 100644 --- a/drivers/media/video/ivtv/ivtv-firmware.c +++ b/drivers/media/video/ivtv/ivtv-firmware.c @@ -41,6 +41,7 @@ #define IVTV_DECODE_INIT_MPEG_FILENAME "v4l-cx2341x-init.mpg" #define IVTV_DECODE_INIT_MPEG_SIZE (152*1024) +MODULE_FIRMWARE(IVTV_DECODE_INIT_MPEG_FILENAME); /* Encoder/decoder firmware sizes */ #define IVTV_FW_ENC_SIZE (376836) @@ -171,6 +172,8 @@ static int ivtv_firmware_copy(struct ivtv *itv) } return 0; } +MODULE_FIRMWARE(CX2341X_FIRM_ENC_FILENAME); +MODULE_FIRMWARE(CX2341X_FIRM_DEC_FILENAME); static volatile struct ivtv_mailbox __iomem *ivtv_search_mailbox(const volatile u8 __iomem *mem, u32 size) {