diff options
author | Ben Hutchings <benh@debian.org> | 2010-09-13 01:37:29 +0000 |
---|---|---|
committer | Ben Hutchings <benh@debian.org> | 2010-09-13 01:37:29 +0000 |
commit | 96fba25e4b6257bfa77de0f0a08f344dfd780ff0 (patch) | |
tree | 133c5d2f147869c2c85d1babebdf33c24a30ee3b /debian/patches/debian/dfsg | |
parent | ba3358c0907748451a4fcde08d2b4f4b958bbfe8 (diff) |
New upstream release candidate 2.6.36-rc4
Remove patches merged upstream.
Rewrite debian/scripts-kconfig-reportoldconfig.patch
Rewrite bugfix/mips/disable-werror.patch as debian/mips-disable-werror.patch
Refresh some other patches.
svn path=/dists/trunk/linux-2.6/; revision=16272
Diffstat (limited to 'debian/patches/debian/dfsg')
-rw-r--r-- | debian/patches/debian/dfsg/files-1 | 2 | ||||
-rw-r--r-- | debian/patches/debian/dfsg/firmware-cleanup.patch | 2 | ||||
-rw-r--r-- | debian/patches/debian/dfsg/lgs8gxx-lgs8g75-disable.patch | 63 |
3 files changed, 1 insertions, 66 deletions
diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index fb132269e..be5b0d02b 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -37,8 +37,6 @@ rm arch/powerpc/sysdev/micropatch.c rm drivers/media/dvb/dvb-usb/af9005-script.h -unifdef drivers/media/dvb/frontends/lgs8gxx.c -UREMOVE_DFSG - rm drivers/net/appletalk/cops.c rm drivers/net/appletalk/cops.h rm drivers/net/appletalk/cops_ffdrv.h diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch index a435a1a28..e78f45677 100644 --- a/debian/patches/debian/dfsg/firmware-cleanup.patch +++ b/debian/patches/debian/dfsg/firmware-cleanup.patch @@ -28,7 +28,7 @@ index 1c00d05..3bf888d 100644 -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.10.0.bin \ - cxgb3/ael2005_opt_edc.bin \ - cxgb3/ael2005_twx_edc.bin \ - cxgb3/ael2020_twx_edc.bin diff --git a/debian/patches/debian/dfsg/lgs8gxx-lgs8g75-disable.patch b/debian/patches/debian/dfsg/lgs8gxx-lgs8g75-disable.patch deleted file mode 100644 index 639dcd609..000000000 --- a/debian/patches/debian/dfsg/lgs8gxx-lgs8g75-disable.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 15e2cca5411a60ec9d936b36be1bac937f1bfeaa Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Tue, 3 Nov 2009 23:50:20 +0000 -Subject: [PATCH 18/24] lgs8gxx: mark lgs8g75 as broken and mark firmware for removal - ---- - drivers/media/dvb/frontends/lgs8gxx.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/drivers/media/dvb/frontends/lgs8gxx.c b/drivers/media/dvb/frontends/lgs8gxx.c -index eabcadc..a7446fd 100644 ---- a/drivers/media/dvb/frontends/lgs8gxx.c -+++ b/drivers/media/dvb/frontends/lgs8gxx.c -@@ -46,6 +46,7 @@ module_param(fake_signal_str, int, 0644); - MODULE_PARM_DESC(fake_signal_str, "fake signal strength for LGS8913." - "Signal strength calculation is slow.(default:on)."); - -+#ifdef REMOVE_DFSG - static const u8 lgs8g75_initdat[] = { - 0x01, 0x30, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, - 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, -@@ -81,6 +82,7 @@ static const u8 lgs8g75_initdat[] = { - 0x65, 0xE0, 0x54, 0xFD, 0xF0, 0x22, 0x90, 0x80, - 0x65, 0xE0, 0x44, 0xC2, 0xF0, 0x22 - }; -+#endif - - /* LGS8GXX internal helper functions */ - -@@ -625,6 +627,7 @@ static int lgs8913_init(struct lgs8gxx_state *priv) - return 0; - } - -+#ifdef CONFIG_BROKEN - static int lgs8g75_init_data(struct lgs8gxx_state *priv) - { - const u8 *p = lgs8g75_initdat; -@@ -652,6 +655,7 @@ static int lgs8g75_init_data(struct lgs8gxx_state *priv) - - return 0; - } -+#endif - - static int lgs8gxx_init(struct dvb_frontend *fe) - { -@@ -1089,7 +1093,14 @@ struct dvb_frontend *lgs8gxx_attach(const struct lgs8gxx_config *config, - priv->frontend.demodulator_priv = priv; - - if (config->prod == LGS8GXX_PROD_LGS8G75) -+#ifdef CONFIG_BROKEN - lgs8g75_init_data(priv); -+#else -+ { -+ dprintk("lgs8g75 firmware not available\n"); -+ goto error_out; -+ } -+#endif - - return &priv->frontend; - --- -1.6.5.2 - |