---

yaml --- r: 259686 b: refs/heads/master c: 657839b h: refs/heads/master v: v3
git-mirror · Jul 5, 2011 · af7c927 · af7c927
1 parent bbbb131
commit af7c927
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 11 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1ff6d5fe7c06937c250ed1644077ac0ad74d8aa4
+refs/heads/master: 657839ba30a32e3317772493312812e3d80d7b4a
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
@@ -6,9 +6,9 @@ ccflags-y += -Iinclude/drm
 psb_gfx-y += gem_glue.o \
 	  backlight.o \
 	  power.o \
+	  framebuffer.o \
 	  psb_drv.o \
 	  psb_gem.o \
-	  psb_fb.o \
 	  psb_2d.o \
 	  psb_gtt.o \
 	  psb_intel_bios.o \

diff --git a/trunk/drivers/staging/gma500/psb_fb.c → trunk/drivers/staging/gma500/framebuffer.c b/trunk/drivers/staging/gma500/psb_fb.c → trunk/drivers/staging/gma500/framebuffer.c
@@ -36,7 +36,7 @@
 #include "psb_drv.h"
 #include "psb_intel_reg.h"
 #include "psb_intel_drv.h"
-#include "psb_fb.h"
+#include "framebuffer.h"
 
 #include "mdfld_output.h"
 

diff --git a/trunk/drivers/staging/gma500/psb_fb.h → trunk/drivers/staging/gma500/framebuffer.h b/trunk/drivers/staging/gma500/psb_fb.h → trunk/drivers/staging/gma500/framebuffer.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PSB_FB_H_
-#define _PSB_FB_H_
+#ifndef _FRAMEBUFFER_H_
+#define _FRAMEBUFFER_H_
 
 #include <linux/version.h>
 #include <drm/drmP.h>

diff --git a/trunk/drivers/staging/gma500/mdfld_intel_display.c b/trunk/drivers/staging/gma500/mdfld_intel_display.c
@@ -24,7 +24,7 @@
  *	Eric Anholt <eric@anholt.net>
  */
 
-#include "psb_fb.h"
+#include "framebuffer.h"
 #include "psb_intel_display.h"
 #include "mdfld_dsi_dbi.h"
 #include "mdfld_dsi_dpi.h"

diff --git a/trunk/drivers/staging/gma500/mrst_crtc.c b/trunk/drivers/staging/gma500/mrst_crtc.c
@@ -19,7 +19,7 @@
 #include <linux/pm_runtime.h>
 
 #include <drm/drmP.h>
-#include "psb_fb.h"
+#include "framebuffer.h"
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"

diff --git a/trunk/drivers/staging/gma500/psb_2d.c b/trunk/drivers/staging/gma500/psb_2d.c
@@ -38,8 +38,7 @@
 
 #include "psb_drv.h"
 #include "psb_reg.h"
-#include "psb_drv.h"
-#include "psb_fb.h"
+#include "framebuffer.h"
 
 /**
  *	psb_spank		-	reset the 2D engine

diff --git a/trunk/drivers/staging/gma500/psb_drv.c b/trunk/drivers/staging/gma500/psb_drv.c
@@ -23,7 +23,7 @@
 #include <drm/drm.h>
 #include "psb_drm.h"
 #include "psb_drv.h"
-#include "psb_fb.h"
+#include "framebuffer.h"
 #include "psb_reg.h"
 #include "psb_intel_reg.h"
 #include "psb_intel_bios.h"

diff --git a/trunk/drivers/staging/gma500/psb_intel_display.c b/trunk/drivers/staging/gma500/psb_intel_display.c
@@ -22,7 +22,7 @@
 #include <linux/pm_runtime.h>
 
 #include <drm/drmP.h>
-#include "psb_fb.h"
+#include "framebuffer.h"
 #include "psb_drv.h"
 #include "psb_intel_drv.h"
 #include "psb_intel_reg.h"