---

yaml --- r: 259688 b: refs/heads/master c: 63e21a5 h: refs/heads/master v: v3
git-mirror · Jul 5, 2011 · f3078e4 · f3078e4
1 parent cedbc98
commit f3078e4
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c3f500516442ffbbfdf3473590e42a3dcabeb96e
+refs/heads/master: 63e21a5bfc97ba2552d7efbb09462b0946af1176
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
@@ -6,11 +6,11 @@ ccflags-y += -Iinclude/drm
 psb_gfx-y += gem_glue.o \
 	  accel_2d.o \
 	  backlight.o \
-	  power.o \
 	  framebuffer.o \
+	  gem.o \
+	  gtt.o \
+	  power.o \
 	  psb_drv.o \
-	  psb_gem.o \
-	  psb_gtt.o \
 	  psb_intel_bios.o \
 	  psb_intel_opregion.o \
 	  psb_intel_display.o \

diff --git a/trunk/drivers/staging/gma500/psb_gem.c → trunk/drivers/staging/gma500/gem.c b/trunk/drivers/staging/gma500/psb_gem.c → trunk/drivers/staging/gma500/gem.c
diff --git a/trunk/drivers/staging/gma500/psb_gtt.c → trunk/drivers/staging/gma500/gtt.c b/trunk/drivers/staging/gma500/psb_gtt.c → trunk/drivers/staging/gma500/gtt.c
diff --git a/trunk/drivers/staging/gma500/psb_gtt.h → trunk/drivers/staging/gma500/gtt.h b/trunk/drivers/staging/gma500/psb_gtt.h → trunk/drivers/staging/gma500/gtt.h
diff --git a/trunk/drivers/staging/gma500/psb_drv.h b/trunk/drivers/staging/gma500/psb_drv.h
@@ -29,7 +29,7 @@
 #include "psb_drm.h"
 #include "psb_reg.h"
 #include "psb_intel_drv.h"
-#include "psb_gtt.h"
+#include "gtt.h"
 #include "psb_powermgmt.h"
 #include "mrst.h"