---

yaml --- r: 259684 b: refs/heads/master c: 35efdae h: refs/heads/master v: v3
git-mirror · Jul 5, 2011 · dc37dd1 · dc37dd1
1 parent 751c36a
commit dc37dd1
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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 → trunk/drivers/staging/gma500/mid_bios.c b/trunk/drivers/staging/gma500/mrst_bios.c → 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 → trunk/drivers/staging/gma500/mid_bios.h b/trunk/drivers/staging/gma500/mrst_bios.h → 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
@@ -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
@@ -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"