---

yaml --- r: 259692 b: refs/heads/master c: 3682a08 h: refs/heads/master v: v3
git-mirror · Jul 5, 2011 · 6bc5291 · 6bc5291
1 parent a5d3b8d
commit 6bc5291
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b21fb57908c02a9cc0a62edcffc7fba00286e6d2
+refs/heads/master: 3682a08049fdf03c3c83b4ce44146dea19057fd7
diff --git a/trunk/drivers/staging/gma500/Makefile b/trunk/drivers/staging/gma500/Makefile
@@ -10,9 +10,9 @@ psb_gfx-y += gem_glue.o \
 	  gem.o \
 	  gtt.o \
 	  intel_bios.o \
+	  intel_opregion.o \
 	  power.o \
 	  psb_drv.o \
-	  psb_intel_opregion.o \
 	  psb_intel_display.o \
 	  psb_intel_i2c.o \
 	  psb_intel_lvds.o \

diff --git a/...ivers/staging/gma500/psb_intel_opregion.c → ...k/drivers/staging/gma500/intel_opregion.c b/...ivers/staging/gma500/psb_intel_opregion.c → ...k/drivers/staging/gma500/intel_opregion.c
@@ -78,4 +78,3 @@ int intel_opregion_exit(struct drm_device *dev)
 		iounmap(dev_priv->lid_state);
 	return 0;
 }
-
Original file line number	Diff line number	Diff line change
Expand Up		@@ -78,4 +78,3 @@ int intel_opregion_exit(struct drm_device *dev)
		iounmap(dev_priv->lid_state);
		return 0;
		}