diff options
| author | Ben Hutchings <benh@debian.org> | 2010-11-28 04:14:29 +0000 |
|---|---|---|
| committer | Ben Hutchings <benh@debian.org> | 2010-11-28 04:14:29 +0000 |
| commit | 741625c82cd863e9ce4bbcd9f561d820704485d6 (patch) | |
| tree | 48357539cacc91baa4c69132fbca202230924fd2 /debian/patches/debian/dfsg | |
| parent | 160388d6e05f65e283827f32b6a90f6cffafc186 (diff) | |
Update to 2.6.37-rc3
svn path=/dists/trunk/linux-2.6/; revision=16606
Diffstat (limited to 'debian/patches/debian/dfsg')
| -rw-r--r-- | debian/patches/debian/dfsg/drivers-staging-otus-disable.patch | 9 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/files-1 | 2 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/firmware-cleanup.patch | 16 |
3 files changed, 9 insertions, 18 deletions
diff --git a/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch b/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch deleted file mode 100644 index 7d360ce2c..000000000 --- a/debian/patches/debian/dfsg/drivers-staging-otus-disable.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- 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 && MAC80211 - select WIRELESS_EXT - select WEXT_PRIV diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index be5b0d02b..0753d599f 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -44,8 +44,6 @@ rm drivers/net/appletalk/cops_ltdrv.h unifdef drivers/net/r8169.c -UREMOVE_DFSG -rm drivers/staging/otus/hal/hp*fw*.c* - unifdef drivers/staging/rtl8192u/r819xU_firmware_img.c -UREMOVE_DFSG rm drivers/staging/vt6656/firmware.c diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch index e78f45677..75c4231a0 100644 --- a/debian/patches/debian/dfsg/firmware-cleanup.patch +++ b/debian/patches/debian/dfsg/firmware-cleanup.patch @@ -2,7 +2,7 @@ diff --git a/firmware/Makefile b/firmware/Makefile index 1c00d05..3bf888d 100644 --- a/firmware/Makefile +++ b/firmware/Makefile -@@ -20,53 +20,8 @@ fw-external-y := $(subst ",,$(CONFIG_EXTRA_FIRMWARE)) +@@ -20,55 +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. @@ -18,12 +18,14 @@ index 1c00d05..3bf888d 100644 - 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.2.13.0.fw bnx2x-e1h-5.2.13.0.fw --fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-5.0.0.j15.fw \ -- bnx2/bnx2-rv2p-09-5.0.0.j10.fw \ -- bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw \ -- bnx2/bnx2-mips-06-5.0.0.j6.fw \ -- bnx2/bnx2-rv2p-06-5.0.0.j3.fw +-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.0.34.0.fw \ +- bnx2x/bnx2x-e1h-6.0.34.0.fw \ +- bnx2x/bnx2x-e2-6.0.34.0.fw +-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.0.17.fw \ +- bnx2/bnx2-rv2p-09-6.0.17.fw \ +- bnx2/bnx2-rv2p-09ax-6.0.17.fw \ +- bnx2/bnx2-mips-06-6.0.15.fw \ +- bnx2/bnx2-rv2p-06-6.0.15.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 \ |