summaryrefslogtreecommitdiff
path: root/drivers/staging/gma500
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-07-05 14:40:43 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 15:20:42 (GMT)
commit35efdaeffce2232a603596631d15f1fff028dbf6 (patch)
tree7907b3daa6d6e03881c763659d817d08f13eee84 /drivers/staging/gma500
parent37070d18f18d3cdd4e56e01baa64a57ec5179401 (diff)
downloadlinux-fsl-qoriq-35efdaeffce2232a603596631d15f1fff028dbf6.tar.xz
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>
Diffstat (limited to 'drivers/staging/gma500')
-rw-r--r--drivers/staging/gma500/Makefile2
-rw-r--r--drivers/staging/gma500/mdfld_device.c2
-rw-r--r--drivers/staging/gma500/mid_bios.c (renamed from drivers/staging/gma500/mrst_bios.c)2
-rw-r--r--drivers/staging/gma500/mid_bios.h (renamed from drivers/staging/gma500/mrst_bios.h)0
-rw-r--r--drivers/staging/gma500/mrst_device.c2
-rw-r--r--drivers/staging/gma500/psb_drv.c2
6 files changed, 5 insertions, 5 deletions
diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index 1b525ac..2ad6b1c 100644
--- 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 daa9487..f258b06 100644
--- 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
index cf015df..9a7731c 100644
--- 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
index 00e7d56..00e7d56 100644
--- a/drivers/staging/gma500/mrst_bios.h
+++ b/drivers/staging/gma500/mid_bios.h
diff --git a/drivers/staging/gma500/mrst_device.c b/drivers/staging/gma500/mrst_device.c
index d71e8d3..195a25b 100644
--- 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 cf5fe91..ba47178 100644
--- 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"