remove a .32 patch

diff --git a/queue-2.6.32/drm-i915-configure-the-tv-sense-state-correctly-on-gm45-to-make-tv-detection-reliable.patch b/queue-2.6.32/drm-i915-configure-the-tv-sense-state-correctly-on-gm45-to-make-tv-detection-reliable.patch
deleted file mode 100644 (file)
index bc414f7..0000000
--- a/queue-2.6.32/drm-i915-configure-the-tv-sense-state-correctly-on-gm45-to-make-tv-detection-reliable.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fb8b5a39b6310379d7b54c0c7113703a8eaf4a57 Mon Sep 17 00:00:00 2001
-From: Zhao Yakui <yakui.zhao@intel.com>
-Date: Wed, 7 Apr 2010 17:11:19 +0800
-Subject: drm/i915: Configure the TV sense state correctly on GM45 to make TV detection reliable
-
-From: Zhao Yakui <yakui.zhao@intel.com>
-
-commit fb8b5a39b6310379d7b54c0c7113703a8eaf4a57 upstream.
-
-The TV detection logic is not reliable on the Cantiga platform.
-Sometimes the TV will be misdetected as the following two cases:
-- TV is misdetected on some laptops. e.g. There is no TV connector
-port or no TV is attached. But the TV is shown as connected.
-- TV connector type is misdetected. e.g. the component TV is
-attached, but the TV is shown as S-video type.
-
-According to the hardware requirement, the TV sense state bits of TV DAC
-register should be cleared to zero on Cantiga platfrom.
-
-https://bugzilla.kernel.org/show_bug.cgi?id=14792
-
-Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
-Tested-by: Santi <santi@agolina.net>
-Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
-Signed-off-by: Eric Anholt <eric@anholt.net>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/gpu/drm/i915/intel_tv.c |    9 +++++++++
- 1 file changed, 9 insertions(+)
-
---- a/drivers/gpu/drm/i915/intel_tv.c
-+++ b/drivers/gpu/drm/i915/intel_tv.c
-@@ -1399,6 +1399,15 @@ intel_tv_detect_type (struct drm_crtc *c
-                  DAC_A_0_7_V |
-                  DAC_B_0_7_V |
-                  DAC_C_0_7_V);
-+
-+      /*
-+       * The TV sense state should be cleared to zero on cantiga platform. Otherwise
-+       * the TV is misdetected. This is hardware requirement.
-+       */
-+      if (IS_GM45(dev))
-+              tv_dac &= ~(TVDAC_STATE_CHG_EN | TVDAC_A_SENSE_CTL |
-+                          TVDAC_B_SENSE_CTL | TVDAC_C_SENSE_CTL);
-+
-       I915_WRITE(TV_CTL, tv_ctl);
-       I915_WRITE(TV_DAC, tv_dac);
-       intel_wait_for_vblank(dev);

diff --git a/queue-2.6.32/series b/queue-2.6.32/series
index dc201504c946ba4d8eea8bb6246506d3b2c55a10..c1e0e6e2c5e04093043081188959524ab2ddbed4 100644 (file)
--- a/queue-2.6.32/series
+++ b/queue-2.6.32/series
@@ -50,7 +50,6 @@ virtio_net-make-delayed-refill-more-reliable.patch
 mm-hugetlb-fix-clear_huge_page.patch
 drm-edid-fix-1024x768-85hz.patch
 drm-radeon-kms-atom-fix-typo-in-lvds-panel-info-parsing.patch
-drm-i915-configure-the-tv-sense-state-correctly-on-gm45-to-make-tv-detection-reliable.patch
 powerpc-fix-handling-of-strncmp-with-zero-len.patch
 powerpc-pseries-only-call-start-cpu-when-a-cpu-is-stopped.patch
 powerpc-oprofile-fix-potential-buffer-overrun-in-op_model_cell.c.patch