From patchwork Sat Nov  7 21:58:47 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Ben Hutchings <ben@decadent.org.uk>
X-Patchwork-Id: 58425
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 nA7Lwt7W028957
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Sat, 7 Nov 2009 21:58:55 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753164AbZKGV6s (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Sat, 7 Nov 2009 16:58:48 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753288AbZKGV6s
	(ORCPT <rfc822;linux-wireless-outgoing>);
	Sat, 7 Nov 2009 16:58:48 -0500
Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:53606 "EHLO
	shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1752953AbZKGV6r convert
	rfc822-to-8bit (ORCPT <rfc822;linux-wireless@vger.kernel.org>);
	Sat, 7 Nov 2009 16:58:47 -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 <ben@decadent.org.uk>)
	id 1N6tJ3-0003Gp-8a; Sat, 07 Nov 2009 21:58:49 +0000
Received: from womble by localhost with local (Exim 4.69)
	(envelope-from <ben@decadent.org.uk>)
	id 1N6tJ1-0007XX-NG; Sat, 07 Nov 2009 21:58:48 +0000
From: Ben Hutchings <ben@decadent.org.uk>
To: John Linville <linville@tuxdriver.com>
Cc: Zhu Yi <yi.zhu@intel.com>, Reinette Chatre <reinette.chatre@intel.com>,
	Intel Linux Wireless <ilw@linux.intel.com>,
	linux-wireless <linux-wireless@vger.kernel.org>
Date: Sat, 07 Nov 2009 21:58:47 +0000
Message-ID: <1257631127.15927.455.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 47/75] ipw2100: 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-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org


diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c
index a741d37..8dfdbd3 100644
--- a/drivers/net/wireless/ipw2x00/ipw2100.c
+++ b/drivers/net/wireless/ipw2x00/ipw2100.c
@@ -8465,6 +8465,12 @@ static int ipw2100_get_firmware(struct ipw2100_priv *priv,
 	return 0;
 }
 
+MODULE_FIRMWARE(IPW2100_FW_NAME("-i"));
+#ifdef CONFIG_IPW2100_MONITOR
+MODULE_FIRMWARE(IPW2100_FW_NAME("-p"));
+#endif
+MODULE_FIRMWARE(IPW2100_FW_NAME(""));
+
 static void ipw2100_release_firmware(struct ipw2100_priv *priv,
 				     struct ipw2100_fw *fw)
 {