From a59394f85f6c60519efc6263c1034af87899a468 Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Tue, 5 Jul 2011 15:43:53 +0100 Subject: [PATCH] gma500: move the power header At this point we now have the file naming making somewhat more sense although the dependancies are not as clean as would be ideal Signed-off-by: Alan Cox Signed-off-by: Greg Kroah-Hartman --- drivers/staging/gma500/backlight.c | 2 +- drivers/staging/gma500/mdfld_dsi_dbi.c | 2 +- drivers/staging/gma500/mdfld_dsi_dbi.h | 2 +- drivers/staging/gma500/mdfld_dsi_output.h | 2 +- drivers/staging/gma500/mrst_crtc.c | 2 +- drivers/staging/gma500/mrst_lvds.c | 2 +- drivers/staging/gma500/power.c | 2 +- drivers/staging/gma500/{psb_powermgmt.h => power.h} | 0 drivers/staging/gma500/psb_drv.c | 2 +- drivers/staging/gma500/psb_drv.h | 2 +- drivers/staging/gma500/psb_intel_display.c | 2 +- drivers/staging/gma500/psb_intel_lvds.c | 2 +- drivers/staging/gma500/psb_irq.c | 2 +- 13 files changed, 12 insertions(+), 12 deletions(-) rename drivers/staging/gma500/{psb_powermgmt.h => power.h} (100%) diff --git a/drivers/staging/gma500/backlight.c b/drivers/staging/gma500/backlight.c index 117649b819b85..4027e700561a3 100644 --- a/drivers/staging/gma500/backlight.c +++ b/drivers/staging/gma500/backlight.c @@ -24,7 +24,7 @@ #include "psb_intel_reg.h" #include "psb_intel_drv.h" #include "intel_bios.h" -#include "psb_powermgmt.h" +#include "power.h" int gma_backlight_init(struct drm_device *dev) { diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.c b/drivers/staging/gma500/mdfld_dsi_dbi.c index 15055c85c1d47..9d2d97db19613 100644 --- a/drivers/staging/gma500/mdfld_dsi_dbi.c +++ b/drivers/staging/gma500/mdfld_dsi_dbi.c @@ -29,7 +29,7 @@ #include "mdfld_dsi_dbi_dpu.h" #include "mdfld_dsi_pkg_sender.h" -#include "psb_powermgmt.h" +#include "power.h" #include int enable_gfx_rtpm; diff --git a/drivers/staging/gma500/mdfld_dsi_dbi.h b/drivers/staging/gma500/mdfld_dsi_dbi.h index 5b049514b31e9..a76813e4155f9 100644 --- a/drivers/staging/gma500/mdfld_dsi_dbi.h +++ b/drivers/staging/gma500/mdfld_dsi_dbi.h @@ -38,7 +38,7 @@ #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "psb_powermgmt.h" +#include "power.h" #include "mdfld_dsi_output.h" #include "mdfld_output.h" diff --git a/drivers/staging/gma500/mdfld_dsi_output.h b/drivers/staging/gma500/mdfld_dsi_output.h index ac25e55dd1f38..0bf00ea8211cc 100644 --- a/drivers/staging/gma500/mdfld_dsi_output.h +++ b/drivers/staging/gma500/mdfld_dsi_output.h @@ -38,7 +38,7 @@ #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "psb_powermgmt.h" +#include "power.h" #include "mdfld_output.h" #include diff --git a/drivers/staging/gma500/mrst_crtc.c b/drivers/staging/gma500/mrst_crtc.c index d12d1a6af2b3c..72464dd0f23db 100644 --- a/drivers/staging/gma500/mrst_crtc.c +++ b/drivers/staging/gma500/mrst_crtc.c @@ -24,7 +24,7 @@ #include "psb_intel_drv.h" #include "psb_intel_reg.h" #include "psb_intel_display.h" -#include "psb_powermgmt.h" +#include "power.h" struct psb_intel_range_t { int min, max; diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c index 9ecb99b98c683..127b2003edaf4 100644 --- a/drivers/staging/gma500/mrst_lvds.c +++ b/drivers/staging/gma500/mrst_lvds.c @@ -28,7 +28,7 @@ #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "psb_powermgmt.h" +#include "power.h" #include /* The max/min PWM frequency in BPCR[31:17] - */ diff --git a/drivers/staging/gma500/power.c b/drivers/staging/gma500/power.c index 0eee7fb5124ec..79eb6703a51bd 100644 --- a/drivers/staging/gma500/power.c +++ b/drivers/staging/gma500/power.c @@ -28,7 +28,7 @@ * Alan Cox */ -#include "psb_powermgmt.h" +#include "power.h" #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h" diff --git a/drivers/staging/gma500/psb_powermgmt.h b/drivers/staging/gma500/power.h similarity index 100% rename from drivers/staging/gma500/psb_powermgmt.h rename to drivers/staging/gma500/power.h diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index a7f3c08b68f25..264fdf4c7a8c1 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -30,7 +30,7 @@ #include "mid_bios.h" #include "mdfld_dsi_dbi.h" #include -#include "psb_powermgmt.h" +#include "power.h" #include #include #include diff --git a/drivers/staging/gma500/psb_drv.h b/drivers/staging/gma500/psb_drv.h index ee782fa2533da..9e4f36129d01e 100644 --- a/drivers/staging/gma500/psb_drv.h +++ b/drivers/staging/gma500/psb_drv.h @@ -30,7 +30,7 @@ #include "psb_reg.h" #include "psb_intel_drv.h" #include "gtt.h" -#include "psb_powermgmt.h" +#include "power.h" #include "mrst.h" /* Append new drm mode definition here, align with libdrm definition */ diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index afd49a7521511..883880d5185f9 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -27,7 +27,7 @@ #include "psb_intel_drv.h" #include "psb_intel_reg.h" #include "psb_intel_display.h" -#include "psb_powermgmt.h" +#include "power.h" #include "mdfld_output.h" diff --git a/drivers/staging/gma500/psb_intel_lvds.c b/drivers/staging/gma500/psb_intel_lvds.c index c9a13a4553282..4a0d2349b467d 100644 --- a/drivers/staging/gma500/psb_intel_lvds.c +++ b/drivers/staging/gma500/psb_intel_lvds.c @@ -27,7 +27,7 @@ #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "psb_powermgmt.h" +#include "power.h" #include u32 CoreClock; diff --git a/drivers/staging/gma500/psb_irq.c b/drivers/staging/gma500/psb_irq.c index 8fc7070c6cf94..4a0fa42893f99 100644 --- a/drivers/staging/gma500/psb_irq.c +++ b/drivers/staging/gma500/psb_irq.c @@ -26,7 +26,7 @@ #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h" -#include "psb_powermgmt.h" +#include "power.h" #include "mdfld_output.h" /* -- 2.39.5