diff options
| author | Alan Cox | 2011-07-05 16:43:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-07-05 17:20:44 +0200 |
| commit | 0cc729bf215ff038d9b9480253f065af69a1f0a3 (patch) | |
| tree | 32998c57a23ecb27c902e9f4a5be527728f007ef /drivers/staging/gma500 | |
| parent | gma500: tidying up the power stuff a spot (diff) | |
| download | kernel-qcow2-linux-0cc729bf215ff038d9b9480253f065af69a1f0a3.tar.gz kernel-qcow2-linux-0cc729bf215ff038d9b9480253f065af69a1f0a3.tar.xz kernel-qcow2-linux-0cc729bf215ff038d9b9480253f065af69a1f0a3.zip | |
gma500: move the BIOS header
We can move this to patch up as well. Shuffle the relevant includes as we
go
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/backlight.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/cdv_device.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/intel_bios.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/intel_bios.h (renamed from drivers/staging/gma500/psb_intel_bios.h) | 0 | ||||
| -rw-r--r-- | drivers/staging/gma500/mrst_lvds.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_device.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/gma500/psb_intel_lvds.c | 4 |
8 files changed, 7 insertions, 9 deletions
diff --git a/drivers/staging/gma500/backlight.c b/drivers/staging/gma500/backlight.c index 47681c963614..117649b819b8 100644 --- a/drivers/staging/gma500/backlight.c +++ b/drivers/staging/gma500/backlight.c @@ -23,7 +23,7 @@ #include "psb_drv.h" #include "psb_intel_reg.h" #include "psb_intel_drv.h" -#include "psb_intel_bios.h" +#include "intel_bios.h" #include "psb_powermgmt.h" int gma_backlight_init(struct drm_device *dev) diff --git a/drivers/staging/gma500/cdv_device.c b/drivers/staging/gma500/cdv_device.c index 5131106eda99..530e8a2885d4 100644 --- a/drivers/staging/gma500/cdv_device.c +++ b/drivers/staging/gma500/cdv_device.c @@ -24,7 +24,7 @@ #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h" -#include "psb_intel_bios.h" +#include "intel_bios.h" static int cdv_output_init(struct drm_device *dev) diff --git a/drivers/staging/gma500/intel_bios.c b/drivers/staging/gma500/intel_bios.c index 5b3e88cb1e8d..1c4714d892a4 100644 --- a/drivers/staging/gma500/intel_bios.c +++ b/drivers/staging/gma500/intel_bios.c @@ -24,7 +24,7 @@ #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" -#include "psb_intel_bios.h" +#include "intel_bios.h" static void *find_section(struct bdb_header *bdb, int section_id) diff --git a/drivers/staging/gma500/psb_intel_bios.h b/drivers/staging/gma500/intel_bios.h index 70f1bf018183..70f1bf018183 100644 --- a/drivers/staging/gma500/psb_intel_bios.h +++ b/drivers/staging/gma500/intel_bios.h diff --git a/drivers/staging/gma500/mrst_lvds.c b/drivers/staging/gma500/mrst_lvds.c index a74657187fae..9ecb99b98c68 100644 --- a/drivers/staging/gma500/mrst_lvds.c +++ b/drivers/staging/gma500/mrst_lvds.c @@ -24,7 +24,7 @@ #include <drm/drmP.h> #include <asm/mrst.h> -#include "psb_intel_bios.h" +#include "intel_bios.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" diff --git a/drivers/staging/gma500/psb_device.c b/drivers/staging/gma500/psb_device.c index 8ac9de74f763..0774c06782e9 100644 --- a/drivers/staging/gma500/psb_device.c +++ b/drivers/staging/gma500/psb_device.c @@ -24,7 +24,7 @@ #include "psb_drv.h" #include "psb_reg.h" #include "psb_intel_reg.h" -#include "psb_intel_bios.h" +#include "intel_bios.h" static int psb_output_init(struct drm_device *dev) diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index e9772abc1a63..a7f3c08b68f2 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -26,7 +26,7 @@ #include "framebuffer.h" #include "psb_reg.h" #include "psb_intel_reg.h" -#include "psb_intel_bios.h" +#include "intel_bios.h" #include "mid_bios.h" #include "mdfld_dsi_dbi.h" #include <drm/drm_pciids.h> diff --git a/drivers/staging/gma500/psb_intel_lvds.c b/drivers/staging/gma500/psb_intel_lvds.c index 41b96d2ee662..c9a13a455328 100644 --- a/drivers/staging/gma500/psb_intel_lvds.c +++ b/drivers/staging/gma500/psb_intel_lvds.c @@ -21,11 +21,9 @@ */ #include <linux/i2c.h> -/* #include <drm/drm_crtc.h> */ -/* #include <drm/drm_edid.h> */ #include <drm/drmP.h> -#include "psb_intel_bios.h" +#include "intel_bios.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" |