remove 2 broken 3.10 patches

diff --git a/queue-3.10/drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch b/queue-3.10/drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch
deleted file mode 100644 (file)
index c7cdccd..0000000
--- a/queue-3.10/drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8e7a65aa70bcc1235a44e40ae0da5056525fe081 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-Date: Wed, 7 Oct 2015 22:08:24 +0300
-Subject: drm/i915: Restore lost DPLL register write on gen2-4
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
-
-commit 8e7a65aa70bcc1235a44e40ae0da5056525fe081 upstream.
-
-We accidentally lost the initial DPLL register write in
-1c4e02746147 drm/i915: Fix DVO 2x clock enable on 830M
-
-The "three times for luck" hack probably saved us from a total
-disaster. But anyway, bring the initial write back so that the
-code actually makes some sense.
-
-Reported-and-tested-by: Nick Bowler <nbowler@draconx.ca>
-References: http://mid.gmane.org/CAN_QmVyMaArxYgEcVVsGvsMo7-6ohZr8HmF5VhkkL4i9KOmrhw@mail.gmail.com
-Cc: Nick Bowler <nbowler@draconx.ca>
-Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-Signed-off-by: Jani Nikula <jani.nikula@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/gpu/drm/i915/intel_display.c |    2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/i915/intel_display.c
-+++ b/drivers/gpu/drm/i915/intel_display.c
-@@ -4293,6 +4293,8 @@ static void vlv_update_pll(struct intel_
- 
-       I915_WRITE(DPLL(pipe), dpll);
- 
-+      I915_WRITE(reg, dpll);
-+
-       /* Wait for the clocks to stabilize. */
-       POSTING_READ(DPLL(pipe));
-       udelay(150);

diff --git a/queue-3.10/iwlwifi-fix-firmware-filename-for-3160.patch b/queue-3.10/iwlwifi-fix-firmware-filename-for-3160.patch
deleted file mode 100644 (file)
index 67ef341..0000000
--- a/queue-3.10/iwlwifi-fix-firmware-filename-for-3160.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From b5a48134f8af08f5243328f8a0b05fc5ae7cf343 Mon Sep 17 00:00:00 2001
-From: Johannes Berg <johannes.berg@intel.com>
-Date: Tue, 22 Sep 2015 10:47:27 +0200
-Subject: iwlwifi: fix firmware filename for 3160
-
-From: Johannes Berg <johannes.berg@intel.com>
-
-commit b5a48134f8af08f5243328f8a0b05fc5ae7cf343 upstream.
-
-The MODULE_FIRMWARE() for 3160 should be using the 7260 version as
-it's done in the device configuration struct instead of referencing
-IWL3160_UCODE_API_OK which doesn't even exist.
-
-Reported-by: Hauke Mehrtens <hauke@hauke-m.de>
-Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- drivers/net/wireless/iwlwifi/iwl-7000.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/drivers/net/wireless/iwlwifi/iwl-7000.c
-+++ b/drivers/net/wireless/iwlwifi/iwl-7000.c
-@@ -185,4 +185,4 @@ const struct iwl_cfg iwl3160_n_cfg = {
- };
- 
- MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));
--MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));
-+MODULE_FIRMWARE(IWL3162_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

diff --git a/queue-3.10/series b/queue-3.10/series
index 2db334eaba988194e7df9f651a2c0914353ba865..5a4fc68362b6f41114f9e9b80fffbee94e9fc532 100644 (file)
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -1,6 +1,5 @@
 ath9k-declare-required-extra-tx-headroom.patch
 iwlwifi-dvm-fix-d3-firmware-pn-programming.patch
-iwlwifi-fix-firmware-filename-for-3160.patch
 iwlwifi-mvm-fix-d3-firmware-pn-programming.patch
 iommu-amd-don-t-clear-dte-flags-when-modifying-it.patch
 powerpc-rtas-validate-rtas.entry-before-calling-enter_rtas.patch
@@ -8,4 +7,3 @@ asoc-wm8904-correct-number-of-eq-registers.patch
 x86-setup-extend-low-identity-map-to-cover-whole-kernel-range.patch
 mm-make-sendfile-2-killable.patch
 drm-nouveau-gem-return-only-valid-domain-when-there-s-only-one.patch
-drm-i915-restore-lost-dpll-register-write-on-gen2-4.patch