From b3f216fcc7af83f413b71e06516fddafbb58502d Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Wed, 23 Jun 2010 14:20:45 -0400
Subject: [PATCH] --- yaml --- r: 203279 b: refs/heads/master c:
 d0ee0ebe17cbeeccdf1e76e9f048c21f56f41e45 h: refs/heads/master i:   203277:
 14e8284d14e5442fcd524f34ed1d2308a8735fac   203275:
 81e63b7de3a90950c4bc5c8775d85c5194baaee7   203271:
 cb81b606873340854d5267d5bb59a8c59bc098f5   203263:
 3bdc87783cdb38f1e6972ccfb736c7854ce67106 v: v3

---
 [refs]                                         |  2 +-
 trunk/drivers/net/wireless/ath/ath9k/hif_usb.c | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index cfa8f04d21c2..9c940d1e1d89 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 25ac8b0d06c4b3e26c7c4c18dc5c3fcc40be58a2
+refs/heads/master: d0ee0ebe17cbeeccdf1e76e9f048c21f56f41e45
diff --git a/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c b/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c
index 74bc80f50292..ad9134bddd1e 100644
--- a/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c
+++ b/trunk/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -16,6 +16,15 @@
 
 #include "htc.h"
 
+/* identify firmware images */
+#define FIRMWARE_AR7010		"ar7010.fw"
+#define FIRMWARE_AR7010_1_1	"ar7010_1_1.fw"
+#define FIRMWARE_AR9271		"ar9271.fw"
+
+MODULE_FIRMWARE(FIRMWARE_AR7010);
+MODULE_FIRMWARE(FIRMWARE_AR7010_1_1);
+MODULE_FIRMWARE(FIRMWARE_AR9271);
+
 static struct usb_device_id ath9k_hif_usb_ids[] = {
 	{ USB_DEVICE(0x0cf3, 0x9271) }, /* Atheros */
 	{ USB_DEVICE(0x0cf3, 0x1006) }, /* Atheros */
@@ -890,12 +899,12 @@ static int ath9k_hif_usb_probe(struct usb_interface *interface,
 	case 0x7010:
 	case 0x9018:
 		if (le16_to_cpu(udev->descriptor.bcdDevice) == 0x0202)
-			hif_dev->fw_name = "ar7010_1_1.fw";
+			hif_dev->fw_name = FIRMWARE_AR7010_1_1;
 		else
-			hif_dev->fw_name = "ar7010.fw";
+			hif_dev->fw_name = FIRMWARE_AR7010;
 		break;
 	default:
-		hif_dev->fw_name = "ar9271.fw";
+		hif_dev->fw_name = FIRMWARE_AR9271;
 		break;
 	}