Patchwork [10/13] Revert "UBUNTU: [Upstream] b43: Declare all possible firmware files."

login
register
mail settings
Submitter Leann Ogasawara
Date May 21, 2010, 11:18 p.m.
Message ID <1274483903.19284.3335.camel@emiko>
Download mbox | patch
Permalink /patch/53225/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Leann Ogasawara - May 21, 2010, 11:18 p.m.
>From 4ce0f66e2e66807234c90f4efa6b72e9a860363a Mon Sep 17 00:00:00 2001
From: Leann Ogasawara <leann.ogasawara@canonical.com>
Date: Fri, 21 May 2010 15:09:20 -0700
Subject: [PATCH 10/13] Revert "UBUNTU: [Upstream] b43: Declare all possible firmware files."

This reverts commit fc79b244fcfc03b9cc7dace9cfd39a661c1306d9.

This patch can be dropped in Maverick. The negotiated upstream patch
contained a sufficient representative sampling of firmware files.

Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
---
 drivers/net/wireless/b43/main.c |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

Patch

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 440d249..9a374ef 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -67,32 +67,7 @@  MODULE_AUTHOR("Michael Buesch");
 MODULE_AUTHOR("Gábor Stefanik");
 MODULE_LICENSE("GPL");
 
-MODULE_FIRMWARE("b43/a0g0bsinitvals5.fw");
-MODULE_FIRMWARE("b43/a0g0bsinitvals9.fw");
-MODULE_FIRMWARE("b43/a0g0initvals5.fw");
-MODULE_FIRMWARE("b43/a0g0initvals9.fw");
-MODULE_FIRMWARE("b43/a0g1bsinitvals13.fw");
-MODULE_FIRMWARE("b43/a0g1bsinitvals5.fw");
-MODULE_FIRMWARE("b43/a0g1bsinitvals9.fw");
-MODULE_FIRMWARE("b43/a0g1initvals13.fw");
-MODULE_FIRMWARE("b43/a0g1initvals5.fw");
-MODULE_FIRMWARE("b43/a0g1initvals9.fw");
-MODULE_FIRMWARE("b43/b0g0bsinitvals13.fw");
-MODULE_FIRMWARE("b43/b0g0bsinitvals5.fw");
-MODULE_FIRMWARE("b43/b0g0bsinitvals9.fw");
-MODULE_FIRMWARE("b43/b0g0initvals13.fw");
-MODULE_FIRMWARE("b43/b0g0initvals5.fw");
-MODULE_FIRMWARE("b43/b0g0initvals9.fw");
-MODULE_FIRMWARE("b43/lp0bsinitvals13.fw");
-MODULE_FIRMWARE("b43/lp0bsinitvals14.fw");
-MODULE_FIRMWARE("b43/lp0bsinitvals15.fw");
-MODULE_FIRMWARE("b43/lp0initvals13.fw");
-MODULE_FIRMWARE("b43/lp0initvals14.fw");
-MODULE_FIRMWARE("b43/lp0initvals15.fw");
-MODULE_FIRMWARE("b43/n0absinitvals11.fw");
-MODULE_FIRMWARE("b43/n0bsinitvals11.fw");
-MODULE_FIRMWARE("b43/n0initvals11.fw");
-MODULE_FIRMWARE("b43/pcm5.fw");
+MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID);
 MODULE_FIRMWARE("b43/ucode11.fw");
 MODULE_FIRMWARE("b43/ucode13.fw");
 MODULE_FIRMWARE("b43/ucode14.fw");