From: Alan Cox Date: Tue, 5 Jul 2011 14:42:36 +0000 (+0100) Subject: gma500: move opregion files X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=3682a08049fdf03c3c83b4ce44146dea19057fd7;p=linux-edison.git 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 Signed-off-by: Greg Kroah-Hartman --- 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 similarity index 99% rename from drivers/staging/gma500/psb_intel_opregion.c rename to 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