---

yaml --- r: 259675 b: refs/heads/master c: 92367fe h: refs/heads/master i: 259673: 8ef61c8 259671: 9a1c25f v: v3
git-mirror · Jul 5, 2011 · 0c3a4c1 · 0c3a4c1
1 parent b39f083
commit 0c3a4c1
Show file tree

Hide file tree

Showing 11 changed files with 848 additions and 539 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bcc70a64a443ec19f84bb0dc3268d2c95b52e209
+refs/heads/master: 92367fe1bca91efa7f689127ba45080d4303d609
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
@@ -4,6 +4,7 @@
 ccflags-y += -Iinclude/drm
 
 psb_gfx-y += gem_glue.o \
+	  power.o \
 	  psb_bl.o \
 	  psb_drv.o \
 	  psb_gem.o \
@@ -19,11 +20,13 @@ psb_gfx-y += gem_glue.o \
 	  psb_intel_sdvo.o \
 	  psb_lid.o \
 	  psb_mmu.o \
-	  psb_powermgmt.o \
 	  psb_irq.o \
+	  psb_device.o \
+	  mrst_device.o \
 	  mrst_crtc.o \
 	  mrst_lvds.o \
 	  mrst_bios.o \
+	  mdfld_device.o \
 	  mdfld_output.o \
 	  mdfld_pyr_cmd.o \
 	  mdfld_tmd_vid.o \