[kernel] r13843 - in dists/trunk/linux-2.6/debian: . patches/features/all

[Ben Hutchings]

Author: benh
Date: Mon Jun 22 23:52:24 2009
New Revision: 13843

Log:
mga: remove unnecessary change from firmware-loading patch

Modified:
   dists/trunk/linux-2.6/debian/changelog
   dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch

Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog	Mon Jun 22 22:56:25 2009	(r13842)
+++ dists/trunk/linux-2.6/debian/changelog	Mon Jun 22 23:52:24 2009	(r13843)
@@ -1,7 +1,11 @@
 linux-2.6 (2.6.30-1~experimental.2) UNRELEASED; urgency=low
 
+  [ maximilian attems ]
   * [powerpc64] Enable modular RTC_DRV_PS3, PS3_VRAM.
 
+  [ Ben Hutchings ]
+  * mga: remove unnecessary change from firmware-loading patch
+
  -- maximilian attems <maks at debian.org>  Thu, 18 Jun 2009 23:50:56 +0200
 
 linux-2.6 (2.6.30-1) unstable; urgency=low

Modified: dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch	Mon Jun 22 22:56:25 2009	(r13842)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-gpu-drm-mga-request_firmware.patch	Mon Jun 22 23:52:24 2009	(r13843)
@@ -1,7 +1,5 @@
-From 0175b4bdefff22f837203fd47f568c4647f24a4f Mon Sep 17 00:00:00 2001
 From: Ben Hutchings <ben at decadent.org.uk>
-Date: Sat, 18 Oct 2008 04:28:10 +0100
-Subject: [PATCH 18/24] mga: Use request_firmware() to load microcode
+Subject: mga: Use request_firmware() to load microcode
 
 Image format is IHEX, one record for each pipe in order (record
 addresses are ignored).
@@ -277,19 +275,3 @@
  }
  
  #define WMISC_EXPECTED		(MGA_WUCODECACHE_ENABLE | MGA_WMASTER_ENABLE)
-diff --git a/include/drm/mga_drm.h b/include/drm/mga_drm.h
-index 944b50a..0b8fc27 100644
---- a/include/drm/mga_drm.h
-+++ b/include/drm/mga_drm.h
-@@ -69,7 +69,7 @@
- #define MGA_MAX_G200_PIPES	8	/* no multitex */
- #define MGA_MAX_G400_PIPES	16
- #define MGA_MAX_WARP_PIPES	MGA_MAX_G400_PIPES
--#define MGA_WARP_UCODE_SIZE	32768	/* in bytes */
-+#define MGA_WARP_UCODE_SIZE	40960	/* in bytes */
- 
- #define MGA_CARD_TYPE_G200	1
- #define MGA_CARD_TYPE_G400	2
--- 
-1.6.1.3
-