remove broken alsa patches from .36 and .37 queues

diff --git a/queue-2.6.36/alsa-hda-create-mixers-on-alc887.patch b/queue-2.6.36/alsa-hda-create-mixers-on-alc887.patch
deleted file mode 100644 (file)
index 3f5614c..0000000
--- a/queue-2.6.36/alsa-hda-create-mixers-on-alc887.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 03b7a1ab557efe34e8f79b78660e514bd7374248 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Tue, 9 Nov 2010 14:35:30 +0100
-Subject: ALSA: HDA: Create mixers on ALC887
-
-From: David Henningsson <david.henningsson@canonical.com>
-
-commit 03b7a1ab557efe34e8f79b78660e514bd7374248 upstream.
-
-BugLink: http://launchpad.net/bugs/669092
-
-ALC887 does not have any volume control ability on the mixer NIDs,
-so put the volume controls on the dac NIDs instead. Without this
-patch, ALC887 users cannot use alsamixer at all.
-
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- sound/pci/hda/patch_realtek.c |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10646,6 +10646,9 @@ static int alc_auto_add_mic_boost(struct
-       return 0;
- }
- 
-+static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
-+                                           const struct auto_pin_cfg *cfg);
-+
- /* almost identical with ALC880 parser... */
- static int alc882_parse_auto_config(struct hda_codec *codec)
- {
-@@ -10663,7 +10666,10 @@ static int alc882_parse_auto_config(stru
-       err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
-       if (err < 0)
-               return err;
--      err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
-+      if (codec->vendor_id == 0x10ec0887)
-+              err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
-+      else
-+              err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
-       if (err < 0)
-               return err;
-       err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
-@@ -16622,7 +16628,7 @@ static void alc861vd_auto_init_analog_in
- #define alc861vd_idx_to_mixer_switch(nid)     ((nid) + 0x0c)
- 
- /* add playback controls from the parsed DAC table */
--/* Based on ALC880 version. But ALC861VD has separate,
-+/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
-  * different NIDs for mute/unmute switch and volume control */
- static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
-                                            const struct auto_pin_cfg *cfg)

diff --git a/queue-2.6.36/series b/queue-2.6.36/series
index d1ea0b3b29bba1ca3ef67d74e296ca42fd149627..959b1c5d3c4e0b1872293b738be1629737216f79 100644 (file)
--- a/queue-2.6.36/series
+++ b/queue-2.6.36/series
@@ -75,7 +75,6 @@ cfg80211-pass-the-reg-hint-initiator-to-helpers.patch
 cfg80211-fix-allowing-country-ies-for-wiphy_flag_strict_regulatory.patch
 radio-aimslab.c-fix-gcc-4.5-bug.patch
 em28xx-fix-audio-input-for-terratec-grabby.patch
-alsa-hda-create-mixers-on-alc887.patch
 alsa-au88x0-limit-number-of-channels-to-fix-oops-via-oss-emu.patch
 alsa-fix-invalid-hardware.h-include-in-ac97c-for-avr32-architecture.patch
 alsa-hda-fix-dmesg-output-of-hdmi-supported-bits.patch

diff --git a/queue-2.6.37/alsa-hda-add-missing-nid-0x19-fixup-for-sony-vaio.patch b/queue-2.6.37/alsa-hda-add-missing-nid-0x19-fixup-for-sony-vaio.patch
index bc53fe25a52918464df95f969b2b745ad33a4dae..1fa055c8790000dd4f54b831099e628fa66b513c 100644 (file)
--- a/queue-2.6.37/alsa-hda-add-missing-nid-0x19-fixup-for-sony-vaio.patch
+++ b/queue-2.6.37/alsa-hda-add-missing-nid-0x19-fixup-for-sony-vaio.patch
@@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
 
 --- a/sound/pci/hda/patch_realtek.c
 +++ b/sound/pci/hda/patch_realtek.c
-@@ -14830,6 +14830,7 @@ static const struct alc_fixup alc269_fix
+@@ -14824,6 +14824,7 @@ static const struct alc_fixup alc269_fix
                        {0x01, AC_VERB_SET_GPIO_MASK, 0x04},
                        {0x01, AC_VERB_SET_GPIO_DIRECTION, 0x04},
                        {0x01, AC_VERB_SET_GPIO_DATA, 0x00},

diff --git a/queue-2.6.37/alsa-hda-create-mixers-on-alc887.patch b/queue-2.6.37/alsa-hda-create-mixers-on-alc887.patch
deleted file mode 100644 (file)
index 6460551..0000000
--- a/queue-2.6.37/alsa-hda-create-mixers-on-alc887.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 03b7a1ab557efe34e8f79b78660e514bd7374248 Mon Sep 17 00:00:00 2001
-From: David Henningsson <david.henningsson@canonical.com>
-Date: Tue, 9 Nov 2010 14:35:30 +0100
-Subject: ALSA: HDA: Create mixers on ALC887
-
-From: David Henningsson <david.henningsson@canonical.com>
-
-commit 03b7a1ab557efe34e8f79b78660e514bd7374248 upstream.
-
-BugLink: http://launchpad.net/bugs/669092
-
-ALC887 does not have any volume control ability on the mixer NIDs,
-so put the volume controls on the dac NIDs instead. Without this
-patch, ALC887 users cannot use alsamixer at all.
-
-Signed-off-by: David Henningsson <david.henningsson@canonical.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- sound/pci/hda/patch_realtek.c |   10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -10857,6 +10857,9 @@ static int alc_auto_add_mic_boost(struct
-       return 0;
- }
- 
-+static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
-+                                           const struct auto_pin_cfg *cfg);
-+
- /* almost identical with ALC880 parser... */
- static int alc882_parse_auto_config(struct hda_codec *codec)
- {
-@@ -10874,7 +10877,10 @@ static int alc882_parse_auto_config(stru
-       err = alc880_auto_fill_dac_nids(spec, &spec->autocfg);
-       if (err < 0)
-               return err;
--      err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
-+      if (codec->vendor_id == 0x10ec0887)
-+              err = alc861vd_auto_create_multi_out_ctls(spec, &spec->autocfg);
-+      else
-+              err = alc880_auto_create_multi_out_ctls(spec, &spec->autocfg);
-       if (err < 0)
-               return err;
-       err = alc880_auto_create_extra_out(spec, spec->autocfg.hp_pins[0],
-@@ -17043,7 +17049,7 @@ static void alc861vd_auto_init_analog_in
- #define alc861vd_idx_to_mixer_switch(nid)     ((nid) + 0x0c)
- 
- /* add playback controls from the parsed DAC table */
--/* Based on ALC880 version. But ALC861VD has separate,
-+/* Based on ALC880 version. But ALC861VD and ALC887 have separate,
-  * different NIDs for mute/unmute switch and volume control */
- static int alc861vd_auto_create_multi_out_ctls(struct alc_spec *spec,
-                                            const struct auto_pin_cfg *cfg)

diff --git a/queue-2.6.37/series b/queue-2.6.37/series
index e907e5270914c2c128923c7760db18d5445c7eda..45611721dc77784332d4f26094e82f3587f4c442 100644 (file)
--- a/queue-2.6.37/series
+++ b/queue-2.6.37/series
@@ -84,7 +84,6 @@ cfg80211-fix-disabling-channels-based-on-hints.patch
 radio-aimslab.c-fix-gcc-4.5-bug.patch
 em28xx-fix-audio-input-for-terratec-grabby.patch
 ix2505v-i2c-transfer-error-code-ignored.patch
-alsa-hda-create-mixers-on-alc887.patch
 alsa-hda-add-missing-nid-0x19-fixup-for-sony-vaio.patch
 alsa-hda-don-t-refer-eld-when-unplugged.patch
 alsa-hda-fix-null-derefence-with-a-single-mic-in-stac-auto-mic-detection.patch