From a9eac38bcdb49df2ce1122b49bd8b1eb19e8cae5 Mon Sep 17 00:00:00 2001
From: Eric Anholt <eric@anholt.net>
Date: Thu, 2 Nov 2006 13:24:54 -0800
Subject: [PATCH] Remove duplicated register defs that were just added.

---
 src/i810_reg.h   | 14 --------------
 src/i830_debug.c |  5 ++---
 2 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/i810_reg.h b/src/i810_reg.h
index 11c06596..d6f7147b 100644
--- a/src/i810_reg.h
+++ b/src/i810_reg.h
@@ -853,20 +853,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 # define DPLL_MD_VGA_UDI_MULTIPLIER_SHIFT	0
 /** @} */
 
-/* SDVO/UDI Multiplier/Divisor register */
-#define DPLLAMD			0x601c
-#define DPLLBMD			0x6020
-
-/* Hi res source UDI divider (-1), non-zeor for UDI fixed freq mode */
-# define DPLLMD_UDI_DIVIDER_HIRES_MASK		(0x3f << 24)
-# define DPLLMD_UDI_DIVIDER_HIRES_SHIFT		24
-# define DPLLMD_UDI_DIVIDER_VGA_MASK		(0x3f << 16)
-# define DPLLMD_UDI_DIVIDER_VGA_SHIFT		16
-# define DPLLMD_SDVOUDI_MULTIPLIER_HIRES_MASK	(0x3f << 8)
-# define DPLLMD_SDVOUDI_MULTIPLIER_HIRES_SHIFT	8
-# define DPLLMD_SDVOUDI_MULTIPLIER_VGA_MASK	(0x3f << 0)
-# define DPLLMD_SDVOUDI_MULTIPLIER_VGA_SHIFT	0
-
 #define DPLL_TEST		0x606c
 
 #define D_STATE			0x6104
diff --git a/src/i830_debug.c b/src/i830_debug.c
index 802330e9..7922af0a 100644
--- a/src/i830_debug.c
+++ b/src/i830_debug.c
@@ -59,7 +59,6 @@ static struct i830SnapshotRec {
     DEFINEREG(DSPFW1),
     DEFINEREG(DSPFW2),
     DEFINEREG(DSPFW3),
-    
 
     DEFINEREG(ADPA),
     DEFINEREG(LVDS),
@@ -90,7 +89,7 @@ static struct i830SnapshotRec {
     DEFINEREG(FPA0),
     DEFINEREG(FPA1),
     DEFINEREG(DPLL_A),
-    DEFINEREG(DPLLAMD),
+    DEFINEREG(DPLL_A_MD),
     DEFINEREG(HTOTAL_A),
     DEFINEREG(HBLANK_A),
     DEFINEREG(HSYNC_A),
@@ -113,7 +112,7 @@ static struct i830SnapshotRec {
     DEFINEREG(FPB0),
     DEFINEREG(FPB1),
     DEFINEREG(DPLL_B),
-    DEFINEREG(DPLLBMD),
+    DEFINEREG(DPLL_B_MD),
     DEFINEREG(HTOTAL_B),
     DEFINEREG(HBLANK_B),
     DEFINEREG(HSYNC_B),