Patchwork Lucid request pull, b43

login
register
mail settings
Submitter Tim Gardner
Date Jan. 7, 2010, 6:40 p.m.
Message ID <20100107184020.C635CF88D8@sepang.rtg.net>
Download mbox | patch
Permalink /patch/42450/
State Accepted
Delegated to: Andy Whitcroft
Headers show

Comments

Tim Gardner - Jan. 7, 2010, 6:40 p.m.
The following changes since commit 51c783591f9d82746795f0a1775b632522b0966e:
  Andy Whitcroft (1):
        UBUNTU: [Config] set CONFIG_RLIMIT_CORE_DEFAULT to 1

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-lucid lp488636

Tim Gardner (1):
      [Upstream] b43: Declare all possible firmware files.

 drivers/net/wireless/b43/main.c |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)

From 8faef9635d6836449c6c17a75893b496ce15f26e Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Thu, 7 Jan 2010 11:10:38 -0700
Subject: [PATCH] [Upstream] b43: Declare all possible firmware files.

BugLink: http://bugs.launchpad.net/bugs/488636

Enhances module information with the names of the firmware files
that could be used by this driver. This helps tools like Jockey to
correctly detect and/or install the firmware files relevant to
this driver.

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 drivers/net/wireless/b43/main.c |   34 ++++++++++++++++++++++++++++++++--
 1 files changed, 32 insertions(+), 2 deletions(-)
Andy Whitcroft - Jan. 8, 2010, 6:07 p.m.
Applied to Lucid.

-apw

Patch

diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 098dda1..dc35f55 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -66,8 +66,38 @@  MODULE_AUTHOR("Michael Buesch");
 MODULE_AUTHOR("Gábor Stefanik");
 MODULE_LICENSE("GPL");
 
-MODULE_FIRMWARE(B43_SUPPORTED_FIRMWARE_ID);
-
+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/ucode11.fw");
+MODULE_FIRMWARE("b43/ucode13.fw");
+MODULE_FIRMWARE("b43/ucode14.fw");
+MODULE_FIRMWARE("b43/ucode15.fw");
+MODULE_FIRMWARE("b43/ucode5.fw");
+MODULE_FIRMWARE("b43/ucode9.fw");
 
 static int modparam_bad_frames_preempt;
 module_param_named(bad_frames_preempt, modparam_bad_frames_preempt, int, 0444);