From patchwork Fri May 21 23:18:23 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 53225 X-Patchwork-Delegate: leann.ogasawara@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 7D9C2B7D20 for ; Sat, 22 May 2010 09:18:55 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUQ-00059M-Ms; Sat, 22 May 2010 00:18:50 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OFbUO-00058Y-CU for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:48 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1OFbUO-0000ge-Aa for ; Sat, 22 May 2010 00:18:48 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1OFbUN-0006if-TU for kernel-team@lists.ubuntu.com; Sat, 22 May 2010 00:18:48 +0100 Subject: [PATCH 10/13] Revert "UBUNTU: [Upstream] b43: Declare all possible firmware files." From: Leann Ogasawara To: kernel-team In-Reply-To: <1274483333.19284.3264.camel@emiko> References: <1274483333.19284.3264.camel@emiko> Date: Fri, 21 May 2010 16:18:23 -0700 Message-ID: <1274483903.19284.3335.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 4ce0f66e2e66807234c90f4efa6b72e9a860363a Mon Sep 17 00:00:00 2001 From: Leann Ogasawara 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 --- drivers/net/wireless/b43/main.c | 27 +-------------------------- 1 files changed, 1 insertions(+), 26 deletions(-) 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");