From 02e9024faf9a07816eae9f9818988e1a48c3fdf8 Mon Sep 17 00:00:00 2001
From: Mart Raudsepp <leio@gentoo.org>
Date: Fri, 14 Nov 2008 15:25:22 +0000
Subject: [PATCH] artecgroup/dbe61: Use existing struct definition from
 arch/x86/msr.h instead of our own

Signed-off-by: Mart Raudsepp <mart.raudsepp@artecdesign.ee>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>

git-svn-id: svn://coreboot.org/repository/coreboot-v3@1022 f3766cd6-281f-0410-b1cd-43a5c92072e9
---
 mainboard/artecgroup/dbe61/stage1.c | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/mainboard/artecgroup/dbe61/stage1.c b/mainboard/artecgroup/dbe61/stage1.c
index 70fd82fb81..97a8480714 100644
--- a/mainboard/artecgroup/dbe61/stage1.c
+++ b/mainboard/artecgroup/dbe61/stage1.c
@@ -29,22 +29,20 @@
 #include <amd_geodelx.h>
 #include <southbridge/amd/cs5536/cs5536.h>
 #include <northbridge/amd/geodelx/raminit.h>
+#include <arch/x86/msr.h>
 
-static const struct wmsr {
-	u32 reg;
-	struct msr  msr;
-} dbe61_msr[] = {
-	{.reg = 0x10000020, {.lo = 0x00fff80, .hi = 0x20000000}},
-	{.reg = 0x10000021, {.lo = 0x80fffe0, .hi = 0x20000000}},
-	{.reg = 0x40000020, {.lo = 0x00fff80, .hi = 0x20000000}},
-	{.reg = 0x40000021, {.lo = 0x80fffe0, .hi = 0x20000000}},
+static const struct msrinit dbe61_msr[] = {
+	{.msrnum = 0x10000020, {.lo = 0x00fff80, .hi = 0x20000000}},
+	{.msrnum = 0x10000021, {.lo = 0x80fffe0, .hi = 0x20000000}},
+	{.msrnum = 0x40000020, {.lo = 0x00fff80, .hi = 0x20000000}},
+	{.msrnum = 0x40000021, {.lo = 0x80fffe0, .hi = 0x20000000}},
 };
 
 static void dbe61_msr_init(void)
 {
 	int i;
 	for (i = 0; i < ARRAY_SIZE(dbe61_msr); i++)
-		wrmsr(dbe61_msr[i].reg, dbe61_msr[i].msr);
+		wrmsr(dbe61_msr[i].msrnum, dbe61_msr[i].msr);
 }
 
 void hardware_stage1(void)