---

yaml --- r: 249034 b: refs/heads/master c: aea74b6 h: refs/heads/master v: v3
git-mirror · Apr 5, 2011 · 6560e12 · 6560e12
1 parent 22f0f95
commit 6560e12
Show file tree

Hide file tree

Showing 20 changed files with 18 additions and 3,773 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b35c063b2084258efee6f1bae583ee21bb07892
+refs/heads/master: aea74b6567997bbb670357caa57aff39c8c390a5
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
@@ -16,15 +16,8 @@ psb_gfx-y += psb_bl.o \
 	  psb_intel_modes.o \
 	  psb_intel_sdvo.o \
 	  psb_reset.o \
-	  psb_sgx.o \
 	  psb_pvr_glue.o \
-	  psb_buffer.o \
-	  psb_fence.o \
 	  psb_mmu.o \
-	  psb_ttm_glue.o \
-	  psb_ttm_fence.o \
-	  psb_ttm_fence_user.o \
-	  psb_ttm_placement_user.o \
 	  psb_powermgmt.o \
 	  psb_irq.o \
 	  mrst_crtc.o \

diff --git a/trunk/drivers/staging/gma500/psb_2d.c b/trunk/drivers/staging/gma500/psb_2d.c
@@ -40,7 +40,6 @@
 #include "psb_reg.h"
 #include "psb_drv.h"
 #include "psb_fb.h"
-#include "psb_sgx.h"
 
 void psb_spank(struct drm_psb_private *dev_priv)
 {