diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/staging/gma500/Makefile | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/framebuffer.c (renamed from drivers/staging/gma500/psb_fb.c) | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/framebuffer.h (renamed from drivers/staging/gma500/psb_fb.h) | 4 | ||||
-rw-r--r-- | drivers/staging/gma500/mdfld_intel_display.c | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/mrst_crtc.c | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/psb_2d.c | 3 | ||||
-rw-r--r-- | drivers/staging/gma500/psb_drv.c | 2 | ||||
-rw-r--r-- | drivers/staging/gma500/psb_intel_display.c | 2 |
8 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile index 2ad6b1c..fb6040f 100644 --- a/drivers/staging/gma500/Makefile +++ b/drivers/staging/gma500/Makefile @@ -6,9 +6,9 @@ ccflags-y += -Iinclude/drm psb_gfx-y += gem_glue.o \ backlight.o \ power.o \ + framebuffer.o \ psb_drv.o \ psb_gem.o \ - psb_fb.o \ psb_2d.o \ psb_gtt.o \ psb_intel_bios.o \ diff --git a/drivers/staging/gma500/psb_fb.c b/drivers/staging/gma500/framebuffer.c index 17c3cf6..716a7b9 100644 --- a/drivers/staging/gma500/psb_fb.c +++ b/drivers/staging/gma500/framebuffer.c @@ -36,7 +36,7 @@ #include "psb_drv.h" #include "psb_intel_reg.h" #include "psb_intel_drv.h" -#include "psb_fb.h" +#include "framebuffer.h" #include "mdfld_output.h" diff --git a/drivers/staging/gma500/psb_fb.h b/drivers/staging/gma500/framebuffer.h index ed6e856..9416a21 100644 --- a/drivers/staging/gma500/psb_fb.h +++ b/drivers/staging/gma500/framebuffer.h @@ -19,8 +19,8 @@ * */ -#ifndef _PSB_FB_H_ -#define _PSB_FB_H_ +#ifndef _FRAMEBUFFER_H_ +#define _FRAMEBUFFER_H_ #include <linux/version.h> #include <drm/drmP.h> diff --git a/drivers/staging/gma500/mdfld_intel_display.c b/drivers/staging/gma500/mdfld_intel_display.c index 0b619b6..1447a5b 100644 --- a/drivers/staging/gma500/mdfld_intel_display.c +++ b/drivers/staging/gma500/mdfld_intel_display.c @@ -24,7 +24,7 @@ * Eric Anholt <eric@anholt.net> */ -#include "psb_fb.h" +#include "framebuffer.h" #include "psb_intel_display.h" #include "mdfld_dsi_dbi.h" #include "mdfld_dsi_dpi.h" diff --git a/drivers/staging/gma500/mrst_crtc.c b/drivers/staging/gma500/mrst_crtc.c index fb9f2a2..d12d1a6 100644 --- a/drivers/staging/gma500/mrst_crtc.c +++ b/drivers/staging/gma500/mrst_crtc.c @@ -19,7 +19,7 @@ #include <linux/pm_runtime.h> #include <drm/drmP.h> -#include "psb_fb.h" +#include "framebuffer.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" diff --git a/drivers/staging/gma500/psb_2d.c b/drivers/staging/gma500/psb_2d.c index df4c519..5ca4c42 100644 --- a/drivers/staging/gma500/psb_2d.c +++ b/drivers/staging/gma500/psb_2d.c @@ -38,8 +38,7 @@ #include "psb_drv.h" #include "psb_reg.h" -#include "psb_drv.h" -#include "psb_fb.h" +#include "framebuffer.h" /** * psb_spank - reset the 2D engine diff --git a/drivers/staging/gma500/psb_drv.c b/drivers/staging/gma500/psb_drv.c index ba47178..4114ffd 100644 --- a/drivers/staging/gma500/psb_drv.c +++ b/drivers/staging/gma500/psb_drv.c @@ -23,7 +23,7 @@ #include <drm/drm.h> #include "psb_drm.h" #include "psb_drv.h" -#include "psb_fb.h" +#include "framebuffer.h" #include "psb_reg.h" #include "psb_intel_reg.h" #include "psb_intel_bios.h" diff --git a/drivers/staging/gma500/psb_intel_display.c b/drivers/staging/gma500/psb_intel_display.c index 6792d0c..afd49a75 100644 --- a/drivers/staging/gma500/psb_intel_display.c +++ b/drivers/staging/gma500/psb_intel_display.c @@ -22,7 +22,7 @@ #include <linux/pm_runtime.h> #include <drm/drmP.h> -#include "psb_fb.h" +#include "framebuffer.h" #include "psb_drv.h" #include "psb_intel_drv.h" #include "psb_intel_reg.h" |