gma500: move opregion files

We've now sorted them out so they can go into the generic code. In actual fact only the non MID devices use the functions but they are small and having the name match i915 is going to help any future merging type work. Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
git-mirror · Jul 5, 2011 · 3682a08 · 3682a08
1 parent b21fb57
commit 3682a08
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/drivers/staging/gma500/Makefile b/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/drivers/staging/gma500/psb_intel_opregion.c → drivers/staging/gma500/intel_opregion.c b/drivers/staging/gma500/psb_intel_opregion.c → 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;
		}