From dc37dd1187b45a65d5ce719bba65af7ca2d10afa Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 5 Jul 2011 15:40:43 +0100
Subject: [PATCH] --- yaml --- r: 259684 b: refs/heads/master c:
 35efdaeffce2232a603596631d15f1fff028dbf6 h: refs/heads/master v: v3

---
 [refs]                                                   | 2 +-
 trunk/drivers/staging/gma500/Makefile                    | 2 +-
 trunk/drivers/staging/gma500/mdfld_device.c              | 2 +-
 trunk/drivers/staging/gma500/{mrst_bios.c => mid_bios.c} | 2 +-
 trunk/drivers/staging/gma500/{mrst_bios.h => mid_bios.h} | 0
 trunk/drivers/staging/gma500/mrst_device.c               | 2 +-
 trunk/drivers/staging/gma500/psb_drv.c                   | 2 +-
 7 files changed, 6 insertions(+), 6 deletions(-)
 rename trunk/drivers/staging/gma500/{mrst_bios.c => mid_bios.c} (99%)
 rename trunk/drivers/staging/gma500/{mrst_bios.h => mid_bios.h} (100%)

diff --git a/[refs] b/[refs]
index b40ece47f73f..fd619c419848 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37070d18f18d3cdd4e56e01baa64a57ec5179401
+refs/heads/master: 35efdaeffce2232a603596631d15f1fff028dbf6
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
index 1b525ac497b0..2ad6b1cf21b1 100644
--- a/trunk/drivers/staging/gma500/Makefile
+++ b/trunk/drivers/staging/gma500/Makefile
@@ -23,10 +23,10 @@ psb_gfx-y += gem_glue.o \
 	  psb_irq.o \
 	  psb_device.o \
 	  cdv_device.o \
+	  mid_bios.o \
 	  mrst_device.o \
 	  mrst_crtc.o \
 	  mrst_lvds.o \
-	  mrst_bios.o \
 	  mdfld_device.o \
 	  mdfld_output.o \
 	  mdfld_pyr_cmd.o \
diff --git a/trunk/drivers/staging/gma500/mdfld_device.c b/trunk/drivers/staging/gma500/mdfld_device.c
index daa9487dc44f..f258b0620a9d 100644
--- a/trunk/drivers/staging/gma500/mdfld_device.c
+++ b/trunk/drivers/staging/gma500/mdfld_device.c
@@ -26,7 +26,7 @@
 #include "psb_drv.h"
 #include "mdfld_output.h"
 #include "mdfld_dsi_output.h"
-#include "mrst_bios.h"
+#include "mid_bios.h"
 
 /*
  *	Provide the Medfield specific backlight management
diff --git a/trunk/drivers/staging/gma500/mrst_bios.c b/trunk/drivers/staging/gma500/mid_bios.c
similarity index 99%
rename from trunk/drivers/staging/gma500/mrst_bios.c
rename to trunk/drivers/staging/gma500/mid_bios.c
index cf015df5b1e5..9a7731c12c94 100644
--- a/trunk/drivers/staging/gma500/mrst_bios.c
+++ b/trunk/drivers/staging/gma500/mid_bios.c
@@ -27,7 +27,7 @@
 #include <drm/drm.h>
 #include "psb_drm.h"
 #include "psb_drv.h"
-#include "mrst_bios.h"
+#include "mid_bios.h"
 #include "mdfld_output.h"
 
 static int panel_id = GCT_DETECT;
diff --git a/trunk/drivers/staging/gma500/mrst_bios.h b/trunk/drivers/staging/gma500/mid_bios.h
similarity index 100%
rename from trunk/drivers/staging/gma500/mrst_bios.h
rename to trunk/drivers/staging/gma500/mid_bios.h
diff --git a/trunk/drivers/staging/gma500/mrst_device.c b/trunk/drivers/staging/gma500/mrst_device.c
index d71e8d3386d2..195a25b92798 100644
--- a/trunk/drivers/staging/gma500/mrst_device.c
+++ b/trunk/drivers/staging/gma500/mrst_device.c
@@ -25,7 +25,7 @@
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
 #include <asm/intel_scu_ipc.h>
-#include "mrst_bios.h"
+#include "mid_bios.h"
 
 /* IPC message and command defines used to enable/disable mipi panel voltages */
 #define IPC_MSG_PANEL_ON_OFF    0xE9
diff --git a/trunk/drivers/staging/gma500/psb_drv.c b/trunk/drivers/staging/gma500/psb_drv.c
index cf5fe91f45dc..ba47178f6231 100644
--- a/trunk/drivers/staging/gma500/psb_drv.c
+++ b/trunk/drivers/staging/gma500/psb_drv.c
@@ -27,7 +27,7 @@
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
 #include "psb_intel_bios.h"
-#include "mrst_bios.h"
+#include "mid_bios.h"
 #include "mdfld_dsi_dbi.h"
 #include <drm/drm_pciids.h>
 #include "psb_powermgmt.h"