summaryrefslogtreecommitdiff
path: root/debian/patches/debian/dfsg
diff options
context:
space:
mode:
authorMaximilian Attems <maks@debian.org>2010-02-18 13:22:31 +0000
committerMaximilian Attems <maks@debian.org>2010-02-18 13:22:31 +0000
commitad46b0d34c7dc32e260f9d8ebbe4044fc71b23ae (patch)
tree980ec35347eee27bc267b81865451b5d6c236633 /debian/patches/debian/dfsg
parent3d930c037aaaaaa3761a3c7c18c32db53855fb86 (diff)
downloaddebian-kernel-packaging-ad46b0d34c7dc32e260f9d8ebbe4044fc71b23ae.tar.gz
rebase to 2.6.33-rc8 new upstream release
fix orig generation * rediff various staging Kconfig and firmware patches * rt3090 is gone nuke evident stable, stable merged, sfc features and MODULE_FIRMWARE (hopefully all merged ;) patches. fix speakup patch to apply to latest staging. auffs needs newer tree and maybe we can get rid of it postsqueeze, so didn't try at all, just nuked. disable vserver again for now. merged all series file into base. TODO: still a some stray patches, but not that urgent.. svn path=/dists/trunk/linux-2.6/; revision=15185
Diffstat (limited to 'debian/patches/debian/dfsg')
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch11
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch9
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch9
-rw-r--r--debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch10
-rw-r--r--debian/patches/debian/dfsg/firmware-cleanup.patch12
-rw-r--r--debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch4
6 files changed, 27 insertions, 28 deletions
diff --git a/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
index 8885c480e..3eecd6e87 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rt2860-disable.patch
@@ -1,9 +1,12 @@
+diff --git a/drivers/staging/rt2860/Kconfig b/drivers/staging/rt2860/Kconfig
+index f9962b6..8d2da65 100644
--- a/drivers/staging/rt2860/Kconfig
+++ b/drivers/staging/rt2860/Kconfig
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
config RT2860
- tristate "Ralink 2860 wireless support"
-+ depends on BROKEN
+ tristate "Ralink 2860/3090 wireless support"
depends on PCI && X86 && WLAN
++ depends on BROKEN
+ select WIRELESS_EXT
+ select WEXT_PRIV
---help---
- This is an experimental driver for the Ralink 2860 wireless chip.
diff --git a/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
index 6e9759d10..aa4f68524 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rt2870-disable.patch
@@ -1,9 +1,12 @@
+diff --git a/drivers/staging/rt2870/Kconfig b/drivers/staging/rt2870/Kconfig
+index fd3ba3a..ce46b49 100644
--- a/drivers/staging/rt2870/Kconfig
+++ b/drivers/staging/rt2870/Kconfig
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
config RT2870
tristate "Ralink 2870/3070 wireless support"
-+ depends on BROKEN
depends on USB && X86 && WLAN
++ depends on BROKEN
+ select WIRELESS_EXT
+ select WEXT_PRIV
---help---
- This is an experimental driver for the Ralink xx70 wireless chips.
diff --git a/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
deleted file mode 100644
index e4a4bc261..000000000
--- a/debian/patches/debian/dfsg/drivers-staging-rt3090-disable.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- 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
- ---help---
- This is an experimental driver for the Ralink 3090 wireless chip.
diff --git a/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch b/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
index beacebb8b..e4fd5b065 100644
--- a/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
+++ b/debian/patches/debian/dfsg/drivers-staging-rtl8192su-disable.patch
@@ -1,9 +1,11 @@
+diff --git a/drivers/staging/rtl8192su/Kconfig b/drivers/staging/rtl8192su/Kconfig
+index 123fa6d..5e081b1 100644
--- a/drivers/staging/rtl8192su/Kconfig
+++ b/drivers/staging/rtl8192su/Kconfig
-@@ -1,5 +1,6 @@
- config RTL8192SU
+@@ -2,5 +2,6 @@ config RTL8192SU
tristate "RealTek RTL8192SU Wireless LAN NIC driver"
-+ depends on BROKEN
- depends on PCI && WLAN
+ depends on PCI && WLAN && USB
depends on WIRELESS_EXT
++ depends on BROKEN
default N
+ ---help---
diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch
index a9c912b94..8a44a99b6 100644
--- a/debian/patches/debian/dfsg/firmware-cleanup.patch
+++ b/debian/patches/debian/dfsg/firmware-cleanup.patch
@@ -1,6 +1,8 @@
+diff --git a/firmware/Makefile b/firmware/Makefile
+index 1c00d05..3bf888d 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
-@@ -20,122 +20,19 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE))
+@@ -20,53 +20,8 @@ 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.
@@ -16,7 +18,7 @@
- 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-5.0.21.0.fw bnx2x-e1h-5.0.21.0.fw
+-fw-shipped-$(CONFIG_BNX2X) += bnx2x-e1-5.2.7.0.fw bnx2x-e1h-5.2.7.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 \
@@ -53,10 +55,8 @@
-fw-shipped-$(CONFIG_MYRI_SBUS) += myricom/lanai.bin
fw-shipped-$(CONFIG_PCMCIA_PCNET) += cis/LA-PCM.cis cis/PCMLM28.cis \
cis/DP83903.cis cis/NE2K.cis \
- cis/tamarack.cis cis/PE-200.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/tamarack.cis cis/PE-200.cis \
+@@ -77,66 +32,8 @@ fw-shipped-$(CONFIG_SERIAL_8250_CS) += cis/MT5634ZLX.cis cis/RS-COM-2P.cis \
cis/COMpad2.cis cis/COMpad4.cis \
cis/SW_555_SER.cis cis/SW_7xx_SER.cis \
cis/SW_8xx_SER.cis
diff --git a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch b/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
index 5adc0cd6c..db3856328 100644
--- a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
+++ b/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch
@@ -16,7 +16,7 @@ index fa49356..3495ff6 100644
{ 0x06, 0x5561 }
};
+#ifdef REMOVE_DFSG
- static struct phy_reg phy_reg_init_2[] = {
+ static const struct phy_reg phy_reg_init_2[] = {
{ 0x1f, 0x0005 },
{ 0x05, 0xffc2 },
@@ -2074,6 +2075,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr)
@@ -42,7 +42,7 @@ index fa49356..3495ff6 100644
{ 0x06, 0x5561 }
};
+#ifdef REMOVE_DFSG
- static struct phy_reg phy_reg_init_1[] = {
+ static const struct phy_reg phy_reg_init_1[] = {
{ 0x1f, 0x0005 },
{ 0x05, 0xffc2 },
@@ -2473,6 +2478,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr)