--- mtrr-uncover.c	2009-05-13 23:25:48.000000000 +0200
+++ mtrr-uncover.c.new	2012-02-26 10:40:20.000000000 +0100
@@ -115,12 +115,12 @@
 static struct target_range *targets = NULL;


-struct mtrr_type {
+struct mtrr_type2 {
     unsigned int type;
     const char *name;
 };

-const struct mtrr_type mtrr_type[] = {
+const struct mtrr_type2 mtrr_type2[] = {
     { MTRR_TYPE_UNCACHABLE, "uncachable" },	/* must be first for mtrr_type_uncachable */
     { MTRR_TYPE_WRCOMB, "write-combining" },
     { MTRR_TYPE_WRTHROUGH, "write-through" },
@@ -128,7 +128,7 @@
     { MTRR_TYPE_WRBACK, "write-back" },
     { 0, NULL }
 };
-#define mtrr_type_uncachable	(&mtrr_type[0])
+#define mtrr_type_uncachable	(&mtrr_type2[0])

 #define NUM_VAR_MTRR	8

@@ -144,7 +144,7 @@
     enum flags flags;
     addr_t base;
     addr_t size;
-    const struct mtrr_type *type;
+    const struct mtrr_type2 *type;
     struct mtrr *parent;
     struct mtrr *elder_sib;
     struct mtrr *younger_sib;
@@ -252,7 +252,7 @@
 	unsigned int regno;
 	addr_t base;
 	addr_t size;
-	const struct mtrr_type *type;
+	const struct mtrr_type2 *type;
 	unsigned int count;

 	lino++;
@@ -383,9 +383,9 @@

 	    case 'T':	/* Type */
 		{
-		    const struct mtrr_type *mt;
+		    const struct mtrr_type2 *mt;

-		    for (mt = mtrr_type; ; mt++ ) {
+		    for (mt = mtrr_type2; ; mt++ ) {
 			if (mt->name == NULL) {
 			    fprintf(stderr
 				, "%s: error reading %s line %d: unknown type\n"