[kernel] r14541 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/debian/dfsg patches/features/all patches/series
Ben Hutchings
benh at alioth.debian.org
Wed Nov 4 02:02:22 UTC 2009
Author: benh
Date: Wed Nov 4 02:02:19 2009
New Revision: 14541
Log:
Update to 2.6.32-rc6
Refresh firmware patches for Kconfig context changes.
Remove bugfix patches merged upstream.
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/cpuidle-return-with-irq-enabled.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/hfsplus-limit-to-2tb.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/series/base
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/changelog Wed Nov 4 02:02:19 2009 (r14541)
@@ -1,4 +1,4 @@
-linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
+linux-2.6 (2.6.32~rc6-1) UNRELEASED; urgency=low
[ Ben Hutchings ]
* New upstream release candidate.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch Wed Nov 4 02:02:19 2009 (r14541)
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/otus/Kconfig b/drivers/staging/otus/Kconfig
-index d549d08..fef9785 100644
--- a/drivers/staging/otus/Kconfig
+++ b/drivers/staging/otus/Kconfig
@@ -1,5 +1,6 @@
config OTUS
tristate "Atheros OTUS 802.11n USB wireless support"
+ depends on BROKEN
- depends on USB && WLAN_80211 && MAC80211
+ depends on USB && WLAN && MAC80211
default N
---help---
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch Wed Nov 4 02:02:19 2009 (r14541)
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
-index 7f44e5e..9fb130d 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
@@ -1,5 +1,6 @@
config RT2860
tristate "Ralink 2860 wireless support"
+ depends on BROKEN
- depends on PCI && X86 && WLAN_80211
+ depends on PCI && X86 && WLAN
---help---
- This is an experimental driver for the Ralink 2860 wireless chip.
+ This is an experimental driver for the Ralink 2860 wireless chip.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch Wed Nov 4 02:02:19 2009 (r14541)
@@ -4,6 +4,6 @@
config RT2870
tristate "Ralink 2870/3070 wireless support"
+ depends on BROKEN
- depends on USB && X86 && WLAN_80211
+ depends on USB && X86 && WLAN
---help---
- This is an experimental driver for the Ralink xx70 wireless chips.
+ This is an experimental driver for the Ralink xx70 wireless chips.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch Wed Nov 4 02:02:19 2009 (r14541)
@@ -4,6 +4,6 @@
config RT3090
tristate "Ralink 3090 wireless support"
+ depends on BROKEN
- depends on PCI && X86 && WLAN_80211
+ depends on PCI && X86 && WLAN
---help---
This is an experimental driver for the Ralink 3090 wireless chip.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch Wed Nov 4 02:02:19 2009 (r14541)
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/rtl8192su/Kconfig b/drivers/staging/rtl8192su/Kconfig
-index 770f412..3b6b088 100644
--- a/drivers/staging/rtl8192su/Kconfig
+++ b/drivers/staging/rtl8192su/Kconfig
@@ -1,5 +1,6 @@
config RTL8192SU
tristate "RealTek RTL8192SU Wireless LAN NIC driver"
+ depends on BROKEN
- depends on PCI
+ depends on PCI && WLAN
depends on WIRELESS_EXT
default N
Modified: dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch Wed Nov 4 02:02:19 2009 (r14541)
@@ -1,20 +1,31 @@
+From 3b25874ebf3f8a675da0e2a2ae358f76ae67141d Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben at decadent.org.uk>
Date: Sun, 28 Jun 2009 15:51:07 +0100
-Subject: [PATCH] rt2860/2870/3070: use the firmware loader interface and library CRC code
+Subject: [PATCH 08/24] rt2860/2870/3070: use the firmware loader interface and library CRC code
Based on work by Darren Salt <linux at youmustbejoking.demon.co.uk>.
+---
+ drivers/staging/rt2860/Kconfig | 3 +-
+ drivers/staging/rt2860/common/rtmp_init.c | 100 ++++++++++++++++++-----------
+ drivers/staging/rt2870/Kconfig | 3 +-
+ drivers/staging/rt3090/Kconfig | 2 +
+ 4 files changed, 68 insertions(+), 40 deletions(-)
+diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
+index 6dff527..b98aba7 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
@@ -1,6 +1,7 @@
config RT2860
tristate "Ralink 2860 wireless support"
- depends on BROKEN
- depends on PCI && X86 && WLAN_80211
+ depends on PCI && X86 && WLAN
+ select CRC_CCITT
+ select FW_LOADER
---help---
This is an experimental driver for the Ralink 2860 wireless chip.
+diff --git a/drivers/staging/rt2860/common/rtmp_init.c b/drivers/staging/rt2860/common/rtmp_init.c
+index 20c2ce2..916be2f 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
@@ -38,14 +38,8 @@
@@ -34,7 +45,7 @@
UCHAR BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
ULONG BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
-@@ -243,12 +180,14 @@ RTMP_REG_PAIR STAMACRegTable[] = {
+@@ -178,12 +172,14 @@ RTMP_REG_PAIR STAMACRegTable[] = {
// RT2870 Firmware Spec only used 1 oct for version expression
//
#define FIRMWARE_MINOR_VERSION 7
@@ -51,7 +62,7 @@
#define FIRMWARE_MAJOR_VERSION 0
#define FIRMWAREIMAGEV1_LENGTH 0x1000
-@@ -256,6 +195,8 @@ RTMP_REG_PAIR STAMACRegTable[] = {
+@@ -191,6 +187,8 @@ RTMP_REG_PAIR STAMACRegTable[] = {
#ifdef RT2860
#define FIRMWARE_MINOR_VERSION 2
@@ -60,7 +71,7 @@
#endif
-@@ -3314,45 +3255,65 @@ NDIS_STATUS NICLoadFirmware(
+@@ -2976,45 +2974,65 @@ NDIS_STATUS NICLoadFirmware(
IN PRTMP_ADAPTER pAd)
{
NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
@@ -128,12 +139,12 @@
+ dev_err(dev, "firmware file %s size is wrong\n", name);
+ goto fail;
+ }
-
-- RT28XX_WRITE_FIRMWARE(pAd, pFirmwareImage, FileLength);
++
+ /* is it new enough? */
+ pAd->FirmwareVersion = (fw->data[fw->size - 4] << 8 |
+ fw->data[fw->size - 3]);
-+
+
+- RT28XX_WRITE_FIRMWARE(pAd, pFirmwareImage, FileLength);
+ if (pAd->FirmwareVersion <
+ (FIRMWARE_MAJOR_VERSION << 8 | FIRMWARE_MINOR_VERSION)) {
+ dev_err(dev, "rt28x0sta: firmware file %s is too old\n",
@@ -154,7 +165,7 @@
/* check if MCU is ready */
Index = 0;
-@@ -3372,9 +3335,15 @@ NDIS_STATUS NICLoadFirmware(
+@@ -3034,9 +3052,15 @@ NDIS_STATUS NICLoadFirmware(
DBGPRINT(RT_DEBUG_ERROR, ("NICLoadFirmware: MCU is not ready\n\n\n"));
} /* End of if */
@@ -170,27 +181,31 @@
} /* End of NICLoadFirmware */
+diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
+index 05ee373..a0c9eb3 100644
--- a/drivers/staging/rt2870/Kconfig
+++ b/drivers/staging/rt2870/Kconfig
-@@ -1,7 +1,8 @@
+@@ -1,6 +1,7 @@
config RT2870
tristate "Ralink 2870/3070 wireless support"
- depends on BROKEN
- depends on USB && X86 && WLAN_80211
+ depends on USB && X86 && WLAN
+ select CRC_CCITT
+ select FW_LOADER
---help---
This is an experimental driver for the Ralink xx70 wireless chips.
-
+diff --git a/drivers/staging/rt3090/Kconfig b/drivers/staging/rt3090/Kconfig
+index 8ba68b0..7a59f34 100644
--- a/drivers/staging/rt3090/Kconfig
+++ b/drivers/staging/rt3090/Kconfig
-@@ -1,7 +1,8 @@
- config RT3090
+@@ -2,5 +2,7 @@ config RT3090
tristate "Ralink 3090 wireless support"
-- depends on BROKEN
- depends on PCI && X86 && WLAN_80211
+ depends on BROKEN
+ depends on PCI && X86 && WLAN
+ select CRC_CCITT
+ select FW_LOADER
---help---
This is an experimental driver for the Ralink 3090 wireless chip.
-
+--
+1.6.5.2
+
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Wed Nov 4 01:07:07 2009 (r14540)
+++ dists/trunk/linux-2.6/debian/patches/series/base Wed Nov 4 02:02:19 2009 (r14541)
@@ -42,6 +42,4 @@
#+ bugfix/all/wireless-regulatory-default-EU.patch
#+ features/sparc/video-sunxvr500-intergraph.patch
+ bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch
-+ bugfix/all/hfsplus-limit-to-2tb.patch
-+ bugfix/all/cpuidle-return-with-irq-enabled.patch
+ debian/dfsg/radeon-add-clarifying-comment-to-r600-blit.patch
More information about the Kernel-svn-changes
mailing list