gma500: the 'mrst' BIOS is actually MID generic

Shuffle the naming so this reflects better and we can try and build some
sort of ordering to the naming scheme.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index 1b525ac497b0f6ec9f53f8194fc729fb5096ac93..2ad6b1cf21b1db113761cb383f99919d11e91644 100644 (file)
--- a/drivers/staging/gma500/Makefile
+++ b/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/drivers/staging/gma500/mdfld_device.c b/drivers/staging/gma500/mdfld_device.c
index daa9487dc44f9befc21ec9b7d05638c04129998d..f258b0620a9d7985606d17708a4b2021f3d26d5e 100644 (file)
--- a/drivers/staging/gma500/mdfld_device.c
+++ b/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/drivers/staging/gma500/mrst_bios.c b/drivers/staging/gma500/mid_bios.c
similarity index 99%
rename from drivers/staging/gma500/mrst_bios.c
rename to drivers/staging/gma500/mid_bios.c
index cf015df5b1e577548b64fbc7a3d7a5eea2f7a85e..9a7731c12c9483fc7f0b8ae325338148dc47ff98 100644 (file)
--- a/drivers/staging/gma500/mrst_bios.c
+++ b/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/drivers/staging/gma500/mrst_bios.h b/drivers/staging/gma500/mid_bios.h
similarity index 100%
rename from drivers/staging/gma500/mrst_bios.h
rename to drivers/staging/gma500/mid_bios.h

diff --git a/drivers/staging/gma500/mrst_device.c b/drivers/staging/gma500/mrst_device.c
index d71e8d3386d2e604ae55256610ff6dedea93b6b5..195a25b92798dc6c05b3eab5631f17dfe20a8575 100644 (file)
--- a/drivers/staging/gma500/mrst_device.c
+++ b/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/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c
index cf5fe91f45dcb5a7db828bb4642a3b5f82b3db22..ba47178f6231094e3d4733cfb0b2491d2b04feba 100644 (file)
--- a/drivers/staging/gma500/psb_drv.c
+++ b/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"