[kernel] r14463 - in dists/trunk/linux-2.6/debian: . patches/bugfix/all patches/bugfix/all/stable patches/bugfix/sparc patches/bugfix/x86 patches/debian patches/debian/dfsg patches/features/all patches/features/all/aufs2 patches/features/all/speakup patches/features/arm patches/series
Ben Hutchings
benh at alioth.debian.org
Mon Oct 26 02:57:18 UTC 2009
Author: benh
Date: Mon Oct 26 02:57:16 2009
New Revision: 14463
Log:
Update to 2.6.32-rc5.
Incorporate 2.6.31-1 changelog from sid.
Move my last changelog addition into the new entry.
Remove obsolete patches.
Update aufs2, firmware and speakup patches.
Update reportoldconfig and version patches.
Added:
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
Deleted:
dists/trunk/linux-2.6/debian/patches/bugfix/all/drivers-gpu-drm-r128-ioctl-add-init-test.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/fs-nfs-avoid-overrun-copying-client-ip.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.31.1.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.31.2.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.31.3.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.31.4.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/stable/2.6.31.5.patch
dists/trunk/linux-2.6/debian/patches/bugfix/sparc/arch-zimage-target.patch
dists/trunk/linux-2.6/debian/patches/bugfix/x86/fix-alternatives-on-486.patch
dists/trunk/linux-2.6/debian/patches/bugfix/x86/fix-i8xx-agp-flush.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-me4000-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3070-disable.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-r128-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-radeon-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-cxgb3-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/arm/mv_cesa.patch
dists/trunk/linux-2.6/debian/patches/features/arm/openrd-machtype.patch
dists/trunk/linux-2.6/debian/patches/features/arm/openrd-sata.patch
dists/trunk/linux-2.6/debian/patches/features/arm/openrd.patch
Modified:
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
dists/trunk/linux-2.6/debian/patches/debian/version.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-kbuild.patch
dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-standalone.patch
dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch
dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
dists/trunk/linux-2.6/debian/patches/series/base
dists/trunk/linux-2.6/debian/patches/series/orig-0
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/changelog Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,12 +1,18 @@
-linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low
+linux-2.6 (2.6.32~rc5-1) UNRELEASED; urgency=low
+
+ * New upstream release candidate.
+ * README.Debian: Add brief information about building specific binary
+ packages (Closes: #546182)
+
+ -- Ben Hutchings <ben at decadent.org.uk> Mon, 26 Oct 2009 01:18:26 +0000
+
+linux-2.6 (2.6.31-1) unstable; urgency=low
[ Ben Hutchings ]
* Include aufs2, marked as staging (Closes: #541828)
* Include speakup modules under staging
* Add stable release 2.6.31.5
* [x86_64] Enable NUMA_EMU (Closes: #541389)
- * README.Debian: Add brief information about building specific binary
- packages (Closes: #546182)
[ Martin Michlmayr ]
* CPUidle: always return with interrupts enabled.
@@ -21,7 +27,11 @@
ia64 and x86_64 to 65536 otherwise default to 32768.
* Unset UEVENT_HELPER_PATH to save some boot cycles.
- -- Ben Hutchings <ben at decadent.org.uk> Tue, 13 Oct 2009 02:18:40 +0100
+ [ Bastian Blank ]
+ * Set ABI to 1.
+ * Enable Apple PMU battery. (closes: #544264)
+
+ -- Bastian Blank <waldi at debian.org> Sat, 24 Oct 2009 19:17:30 +0200
linux-2.6 (2.6.31-1~experimental.2) experimental; urgency=low
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 Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,11 +1,9 @@
-diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
-index 8398d97..cd4f0b6 100644
--- a/drivers/staging/rt2870/Kconfig
+++ b/drivers/staging/rt2870/Kconfig
@@ -1,5 +1,6 @@
config RT2870
- tristate "Ralink 2870 wireless support"
+ tristate "Ralink 2870/3070 wireless support"
+ depends on BROKEN
depends on USB && X86 && WLAN_80211
---help---
- This is an experimental driver for the Ralink 2870 wireless chip.
+ This is an experimental driver for the Ralink xx70 wireless chips.
Added: dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -0,0 +1,9 @@
+--- a/drivers/staging/rt3090/Kconfig
++++ b/drivers/staging/rt3090/Kconfig
+@@ -1,5 +1,6 @@
+ config RT3090
+ tristate "Ralink 3090 wireless support"
++ depends on BROKEN
+ depends on PCI && X86 && WLAN_80211
+ ---help---
+ This is an experimental driver for the Ralink 3090 wireless chip.
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/files-1 Mon Oct 26 02:57:16 2009 (r14463)
@@ -34,12 +34,6 @@
rm drivers/media/dvb/dvb-usb/af9005-script.h
-rm drivers/gpu/drm/mga/mga_ucode.h
-
-unifdef drivers/gpu/drm/r128/r128_cce.c -UREMOVE_DFSG
-
-rm drivers/gpu/drm/radeon/*_microcode.h
-
rm drivers/infiniband/hw/ipath/ipath_sd7220_img.c
rm drivers/net/appletalk/cops.c
@@ -47,23 +41,21 @@
rm drivers/net/appletalk/cops_ffdrv.h
rm drivers/net/appletalk/cops_ltdrv.h
-unifdef drivers/net/cxgb3/ael1002.c -UREMOVE_DFSG
-
-rm drivers/staging/me4000/me*_firmware.h
-
rm drivers/staging/otus/hal/hp*fw*.c*
rm drivers/staging/rt2860/common/firmware.h
-rm drivers/staging/rt2870/common/firmware.h
-
rm drivers/staging/rt3070/firmware.h
+rm drivers/staging/rt3090/firmware.h
+
rm drivers/staging/rtl8192su/r8192S_FwImgDTM.h
rm drivers/staging/rtl8192su/r8192SU_HWImg.c
rm drivers/staging/rtl8192su/r819xU_firmware_img.c
rm drivers/staging/sxg/sxgphycode-1.2.h
+rm drivers/staging/vt6656/firmware.c
+
rm sound/pci/cs46xx/cs46xx_image.h
rm sound/pci/cs46xx/imgs
Modified: dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/debian/dfsg/firmware-cleanup.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,8 +1,6 @@
-diff --git a/firmware/Makefile b/firmware/Makefile
-index 25200d1..c3a4fa8 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,96 +20,11 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,120 +20,13 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
# accurate. In the latter case it doesn't matter -- it'll use $(fw-shipped-all).
# But be aware that the config file might not be included at all.
@@ -18,24 +16,48 @@
- adaptec/starfire_tx.bin
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
-fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
--fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-4.8.53.0.fw bnx2x-e1h-4.8.53.0.fw
--fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-4.6.17.fw \
-- bnx2/bnx2-rv2p-09-4.6.15.fw \
-- bnx2/bnx2-mips-06-4.6.16.fw \
-- bnx2/bnx2-rv2p-06-4.6.16.fw
+-fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.0.21.0.fw bnx2x-e1h-5.0.21.0.fw
+-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j3.fw \
+- bnx2/bnx2-rv2p-09-5.0.0.j3.fw \
+- bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw \
+- bnx2/bnx2-mips-06-5.0.0.j3.fw \
+- bnx2/bnx2-rv2p-06-5.0.0.j3.fw
-fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin
-fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin
-fw-shipped-$(CONFIG_CHELSIO_T3) += cxgb3/t3b_psram-1.1.0.bin \
- cxgb3/t3c_psram-1.1.0.bin \
-- cxgb3/t3fw-7.4.0.bin
+- cxgb3/t3fw-7.4.0.bin \
+- cxgb3/ael2005_opt_edc.bin \
+- cxgb3/ael2005_twx_edc.bin \
+- cxgb3/ael2020_twx_edc.bin
+-fw-shipped-$(CONFIG_DRM_MGA) += matrox/g200_warp.fw matrox/g400_warp.fw
+-fw-shipped-$(CONFIG_DRM_R128) += r128/r128_cce.bin
+-fw-shipped-$(CONFIG_DRM_RADEON) += radeon/R100_cp.bin radeon/R200_cp.bin \
+- radeon/R300_cp.bin radeon/R420_cp.bin \
+- radeon/RS690_cp.bin radeon/RS600_cp.bin \
+- radeon/R520_cp.bin \
+- radeon/R600_pfp.bin radeon/R600_me.bin \
+- radeon/RV610_pfp.bin radeon/RV610_me.bin \
+- radeon/RV630_pfp.bin radeon/RV630_me.bin \
+- radeon/RV620_pfp.bin radeon/RV620_me.bin \
+- radeon/RV635_pfp.bin radeon/RV635_me.bin \
+- radeon/RV670_pfp.bin radeon/RV670_me.bin \
+- radeon/RS780_pfp.bin radeon/RS780_me.bin \
+- radeon/RV770_pfp.bin radeon/RV770_me.bin \
+- radeon/RV730_pfp.bin radeon/RV730_me.bin \
+- radeon/RV710_pfp.bin radeon/RV710_me.bin
fw-shipped-$(CONFIG_DVB_AV7110) += av7110/bootcode.bin
-fw-shipped-$(CONFIG_DVB_TTUSB_BUDGET) += ttusb-budget/dspbootcode.bin
-fw-shipped-$(CONFIG_E100) += e100/d101m_ucode.bin e100/d101s_ucode.bin \
- e100/d102e_ucode.bin
-fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
- fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis
+ fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
+ cis/DP83903.cis cis/NE2K.cis \
+ cis/tamarack.cis
-fw-shipped-$(CONFIG_PCMCIA_3C589) += cis/3CXEM556.cis
-fw-shipped-$(CONFIG_PCMCIA_3C574) += cis/3CCFEM556.cis
+-fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
+- cis/COMpad2.cis cis/COMpad4.cis
-fw-shipped-$(CONFIG_PCMCIA_SMC91C92) += ositech/Xilinx7OD.bin
-fw-shipped-$(CONFIG_SCSI_ADVANSYS) += advansys/mcode.bin advansys/38C1600.bin \
- advansys/3550.bin advansys/38C0800.bin
Modified: dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/debian/scripts-kconfig-reportoldconfig.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -2,12 +2,12 @@
index fa8c2dd..7936c57 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
-@@ -2,7 +2,7 @@
- # Kernel configuration targets
+@@ -3,7 +3,7 @@
# These targets are used from top-level makefile
--PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
-+PHONY += oldconfig xconfig gconfig menuconfig config reportoldconfig silentoldconfig updateoldconfig update-po-config
+ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
+- localmodconfig localyesconfig
++ localmodconfig localyesconfig reportoldconfig updateoldconfig
ifdef KBUILD_KCONFIG
Kconfig := $(KBUILD_KCONFIG)
@@ -24,9 +24,9 @@
+updateoldconfig: $(obj)/conf
+ $< -U $(Kconfig)
+
- # Create new linux.pot file
- # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
- # The symlink is used to repair a deficiency in arch/um
+ localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+ $(Q)perl $< $(Kconfig) > .tmp.config
+ $(Q)if [ -f .config ]; then \
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 3e1057f..e526d00 100644
--- a/scripts/kconfig/conf.c
Modified: dists/trunk/linux-2.6/debian/patches/debian/version.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/debian/version.patch Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/debian/version.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -41,7 +41,7 @@
index 82d0af4..d8e0d05 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
-@@ -47,15 +47,35 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
+@@ -47,19 +47,34 @@ UTS_TRUNCATE="sed -e s/\(.\{1,$UTS_LEN\}\).*/\1/"
echo \#define UTS_VERSION \"`echo $UTS_VERSION | $UTS_TRUNCATE`\"
echo \#define LINUX_COMPILE_TIME \"`date +%T`\"
@@ -49,10 +49,15 @@
- echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
- if [ -x /bin/dnsdomainname ]; then
-- echo \#define LINUX_COMPILE_DOMAIN \"`dnsdomainname | $UTS_TRUNCATE`\"
+- domain=`dnsdomainname 2> /dev/null`
- elif [ -x /bin/domainname ]; then
-- echo \#define LINUX_COMPILE_DOMAIN \"`domainname | $UTS_TRUNCATE`\"
+- domain=`domainname 2> /dev/null`
+- fi
+-
+- if [ -n "$domain" ]; then
+- echo \#define LINUX_COMPILE_DOMAIN \"`echo $domain | $UTS_TRUNCATE`\"
- else
+- echo \#define LINUX_COMPILE_DOMAIN
+ DISTRIBUTION=$(lsb_release -is 2>/dev/null)
+ DISTRIBUTION=${DISTRIBUTION:-Debian}
+ echo \#define LINUX_COMPILE_DISTRIBUTION \"$DISTRIBUTION\"
@@ -63,7 +68,6 @@
+ echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$DISTRIBUTION_VERSION\"
+ echo \#define LINUX_COMPILE_BY \"unknown\"
+ echo \#define LINUX_COMPILE_HOST \"$DISTRIBUTION\"
- echo \#define LINUX_COMPILE_DOMAIN
+ else
+ if [ -e version.$DISTRIBUTION ]; then
+ echo \#define LINUX_COMPILE_DISTRIBUTION_VERSION \"$(cut -d" " -f1 version.$DISTRIBUTION)\"
@@ -83,4 +87,4 @@
+ fi
fi
- echo \#define LINUX_COMPILER \"`LC_ALL=C LANG=C $CC -v 2>&1 | tail -n 1`\"
+ echo \#define LINUX_COMPILER \"`$CC -v 2>&1 | tail -n 1`\"
Modified: dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-kbuild.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-kbuild.patch Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-kbuild.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,13 +1,15 @@
aufs2 kbuild patch for linux-2.6.31
+Trivial update for 2.6.32 by Ben Hutchings <ben at decadent.org.uk>
+
diff --git a/fs/Kconfig b/fs/Kconfig
index 0e7da7b..a4194da 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -187,6 +187,7 @@ source "fs/sysv/Kconfig"
+ source "fs/sysv/Kconfig"
source "fs/ufs/Kconfig"
source "fs/exofs/Kconfig"
- source "fs/nilfs2/Kconfig"
+source "fs/aufs/Kconfig"
endif # MISC_FILESYSTEMS
Modified: dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-standalone.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-standalone.patch Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/features/all/aufs2/aufs2-standalone.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,5 +1,7 @@
aufs2 standalone patch for linux-2.6.31
+Trivial update for 2.6.32 by Ben Hutchings <ben at decadent.org.uk>
+
diff --git a/fs/namei.c b/fs/namei.c
index b49c2af..4521c70 100644
--- a/fs/namei.c
@@ -46,7 +48,7 @@
+++ b/fs/open.c
@@ -221,6 +221,7 @@ int do_truncate(struct dentry *dentry, loff_t length, unsigned int time_attrs,
mutex_unlock(&dentry->d_inode->i_mutex);
- return err;
+ return ret;
}
+EXPORT_SYMBOL_GPL(do_truncate);
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 Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-staging-rt28x0sta-request_firmware.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,18 +1,9 @@
-From a504b7009265d58543dcb3446421da51424241d4 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
Based on work by Darren Salt <linux at youmustbejoking.demon.co.uk>.
----
- drivers/staging/rt2860/Kconfig | 3 +-
- drivers/staging/rt2860/common/rtmp_init.c | 159 ++++++++++++-----------------
- drivers/staging/rt2870/Kconfig | 3 +-
- drivers/staging/rt3070/Kconfig | 3 +-
- 4 files changed, 70 insertions(+), 98 deletions(-)
-diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
-index 9fb130d..d75a87a 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
@@ -1,6 +1,7 @@
@@ -24,91 +15,24 @@
+ 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 004f530..f34011c 100644
--- a/drivers/staging/rt2860/common/rtmp_init.c
+++ b/drivers/staging/rt2860/common/rtmp_init.c
-@@ -38,18 +38,8 @@
+@@ -38,14 +38,7 @@
Jan Lee 2006-09-15 RT2860. Change for 802.11n , EEPROM, Led, BA, HT.
*/
#include "../rt_config.h"
--#ifndef RT30xx
-#ifdef RT2860
-#include "firmware.h"
-#include <linux/bitrev.h>
-#endif
-#ifdef RT2870
--#include "../../rt2870/common/firmware.h"
--#endif
--#endif
--#ifdef RT30xx
+-/* New firmware handles both RT2870 and RT3070. */
-#include "../../rt3070/firmware.h"
-#endif
+#include <linux/firmware.h>
-+#include <linux/crc-ccitt.h>
UCHAR BIT8[] = {0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80};
ULONG BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
-@@ -63,59 +53,6 @@ ULONG BIT32[] = {0x00000001, 0x00000002, 0x00000004, 0x00000008,
-
- char* CipherName[] = {"none","wep64","wep128","TKIP","AES","CKIP64","CKIP128"};
-
--const unsigned short ccitt_16Table[] = {
-- 0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
-- 0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
-- 0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
-- 0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
-- 0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
-- 0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
-- 0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
-- 0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
-- 0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
-- 0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
-- 0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
-- 0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
-- 0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
-- 0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
-- 0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
-- 0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
-- 0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
-- 0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
-- 0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
-- 0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
-- 0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
-- 0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-- 0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
-- 0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
-- 0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
-- 0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
-- 0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
-- 0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
-- 0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
-- 0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
-- 0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
-- 0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
--};
--#define ByteCRC16(v, crc) \
-- (unsigned short)((crc << 8) ^ ccitt_16Table[((crc >> 8) ^ (v)) & 255])
--
--#ifdef RT2870
--unsigned char BitReverse(unsigned char x)
--{
-- int i;
-- unsigned char Temp=0;
-- for(i=0; ; i++)
-- {
-- if(x & 0x80) Temp |= 0x80;
-- if(i==7) break;
-- x <<= 1;
-- Temp >>= 1;
-- }
-- return Temp;
--}
--#endif
--
- //
- // BBP register initialization set
- //
@@ -243,12 +180,14 @@ RTMP_REG_PAIR STAMACRegTable[] = {
// RT2870 Firmware Spec only used 1 oct for version expression
//
@@ -245,34 +169,27 @@
} /* End of NICLoadFirmware */
-diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
-index cd4f0b6..59d533d 100644
--- a/drivers/staging/rt2870/Kconfig
+++ b/drivers/staging/rt2870/Kconfig
@@ -1,7 +1,8 @@
config RT2870
- tristate "Ralink 2870 wireless support"
+ tristate "Ralink 2870/3070 wireless support"
- depends on BROKEN
depends on USB && X86 && WLAN_80211
+ select CRC_CCITT
+ select FW_LOADER
---help---
- This is an experimental driver for the Ralink 2870 wireless chip.
+ This is an experimental driver for the Ralink xx70 wireless chips.
-diff --git a/drivers/staging/rt3070/Kconfig b/drivers/staging/rt3070/Kconfig
-index e414305..7242d5e 100644
---- a/drivers/staging/rt3070/Kconfig
-+++ b/drivers/staging/rt3070/Kconfig
+--- a/drivers/staging/rt3090/Kconfig
++++ b/drivers/staging/rt3090/Kconfig
@@ -1,7 +1,8 @@
- config RT3070
- tristate "Ralink 3070 wireless support"
+ config RT3090
+ tristate "Ralink 3090 wireless support"
- depends on BROKEN
- depends on USB && X86 && WLAN_80211
+ depends on PCI && X86 && WLAN_80211
+ select CRC_CCITT
+ select FW_LOADER
---help---
- This is an experimental driver for the Ralink 3070 wireless chip.
+ This is an experimental driver for the Ralink 3090 wireless chip.
---
-1.6.3.1
-
Modified: dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/features/all/speakup/speakup-kbuild.patch Mon Oct 26 02:57:16 2009 (r14463)
@@ -4,9 +4,9 @@
--- a/drivers/staging/Kconfig
+++ b/drivers/staging/Kconfig
@@ -126,6 +126,8 @@
- source "drivers/staging/pata_rdc/Kconfig"
+ source "drivers/staging/sep/Kconfig"
- source "drivers/staging/udlfb/Kconfig"
+ source "drivers/staging/iio/Kconfig"
+
+source "drivers/staging/speakup/Kconfig"
@@ -15,9 +15,9 @@
--- a/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@ -45,3 +45,4 @@
- obj-$(CONFIG_USB_CPC) += cpc-usb/
- obj-$(CONFIG_RDC_17F3101X) += pata_rdc/
- obj-$(CONFIG_FB_UDL) += udlfb/
+ obj-$(CONFIG_RAR_REGISTER) += rar/
+ obj-$(CONFIG_DX_SEP) += sep/
+ obj-$(CONFIG_IIO) += iio/
+obj-$(CONFIG_SPEAKUP) += speakup/
--- a/drivers/staging/speakup/Kbuild
+++ b/drivers/staging/speakup/Kbuild
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/series/base Mon Oct 26 02:57:16 2009 (r14463)
@@ -6,12 +6,8 @@
+ debian/drivers-ata-ata_piix-postpone-pata.patch
+ debian/drivers-ata-pata_sis-postpone-pata.patch
-+ features/all/drivers-gpu-drm-mga-request_firmware.patch
-+ features/all/drivers-gpu-drm-r128-request_firmware.patch
-+ features/all/drivers-gpu-drm-radeon-request_firmware.patch
+ features/all/drivers-infiniband-hw-ipath-iba7220-use-request_firmware.patch
+ features/all/drivers-media-dvb-usb-af9005-request_firmware.patch
-+ features/all/drivers-net-cxgb3-request_firmware.patch
+ features/all/drivers-staging-rt28x0sta-request_firmware.patch
+ features/all/export-unionfs-symbols.patch
+ features/all/sound-pci-cs46xx-request_firmware.patch
@@ -41,22 +37,6 @@
+ bugfix/powerpc/lpar-console.patch
#+ bugfix/all/wireless-regulatory-default-EU.patch
#+ features/sparc/video-sunxvr500-intergraph.patch
-+ bugfix/sparc/arch-zimage-target.patch
-+ features/arm/openrd-machtype.patch
-+ features/arm/openrd.patch
-+ features/arm/openrd-sata.patch
-+ features/arm/mv_cesa.patch
+ bugfix/all/drivers-scsi-qla1280-request-firmware-unlocked.patch
-+ bugfix/all/drivers-gpu-drm-r128-ioctl-add-init-test.patch
-+ bugfix/x86/fix-alternatives-on-486.patch
-+ bugfix/x86/fix-i8xx-agp-flush.patch
-+ bugfix/all/stable/2.6.31.1.patch
-+ bugfix/all/fs-nfs-avoid-overrun-copying-client-ip.patch
-- bugfix/x86/fix-i8xx-agp-flush.patch
-+ bugfix/all/stable/2.6.31.2.patch
-+ bugfix/all/drivers-net-sfc-fix-initial-link-state.patch
-+ bugfix/all/stable/2.6.31.3.patch
+ bugfix/all/hfsplus-limit-to-2tb.patch
-+ bugfix/all/stable/2.6.31.4.patch
+ bugfix/all/cpuidle-return-with-irq-enabled.patch
-+ bugfix/all/stable/2.6.31.5.patch
Modified: dists/trunk/linux-2.6/debian/patches/series/orig-0
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/orig-0 Mon Oct 26 01:13:18 2009 (r14462)
+++ dists/trunk/linux-2.6/debian/patches/series/orig-0 Mon Oct 26 02:57:16 2009 (r14463)
@@ -1,17 +1,17 @@
+ debian/dfsg/arch-powerpc-platforms-8xx-ucode-disable.patch
+ debian/dfsg/drivers-media-dvb-dvb-usb-af9005-disable.patch
-+ debian/dfsg/drivers-gpu-drm-mga-disable.patch
-+ debian/dfsg/drivers-gpu-drm-r128-disable.patch
-+ debian/dfsg/drivers-gpu-drm-radeon-disable.patch
+ debian/dfsg/drivers-infiniband-hw-ipath-iba7220-disable.patch
+ debian/dfsg/drivers-net-appletalk-cops.patch
-+ debian/dfsg/drivers-net-cxgb3-disable.patch
-+ debian/dfsg/drivers-staging-me4000-disable.patch
+ debian/dfsg/drivers-staging-otus-disable.patch
+ debian/dfsg/drivers-staging-rt2860-disable.patch
+ debian/dfsg/drivers-staging-rt2870-disable.patch
-+ debian/dfsg/drivers-staging-rt3070-disable.patch
++ debian/dfsg/drivers-staging-rt3090-disable.patch
+ debian/dfsg/drivers-staging-rtl8192su-disable.patch
+ debian/dfsg/firmware-cleanup.patch
+ debian/dfsg/sound-pci.patch
X debian/dfsg/files-1
+
+# TODO for 2.6.32:
+# drivers/gpu/drm/radeon/r600_blit_shaders.c: r{6,7}xx_default_state
+# drivers/media/dvb/frontends/lgs8gxx.c: lgs8g75_initdat
+# drivers/net/r8169.c: phy_reg_init_2 in rtl8168d_{1,2}_hw_phy_config()
More information about the Kernel-svn-changes
mailing list