summaryrefslogtreecommitdiffstats
path: root/drivers/staging/gma500
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2011-07-05 15:42:36 +0100
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-05 08:20:43 -0700
commit3682a08049fdf03c3c83b4ce44146dea19057fd7 (patch)
tree046b76a0f27b1ed9dc9b31cd624bd7e3180ae825 /drivers/staging/gma500
parentb21fb57908c02a9cc0a62edcffc7fba00286e6d2 (diff)
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>
Diffstat (limited to 'drivers/staging/gma500')
-rw-r--r--drivers/staging/gma500/Makefile2
-rw-r--r--drivers/staging/gma500/intel_opregion.c (renamed from drivers/staging/gma500/psb_intel_opregion.c)1
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index 7f76a192301..c0143732f32 100644
--- 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 b/drivers/staging/gma500/intel_opregion.c
index a586f3de765..824096510d4 100644
--- a/drivers/staging/gma500/psb_intel_opregion.c
+++ b/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;
}
- \ No newline at end of file