From 657839ba30a32e3317772493312812e3d80d7b4a Mon Sep 17 00:00:00 2001
From: Alan Cox <alan@linux.intel.com>
Date: Tue, 5 Jul 2011 15:41:11 +0100
Subject: [PATCH] gma500: move framebuffer file

The framebuffer code is now clean of device specific code, and passes
checkpatch. Move it to its new name

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 drivers/staging/gma500/Makefile                    | 2 +-
 drivers/staging/gma500/{psb_fb.c => framebuffer.c} | 2 +-
 drivers/staging/gma500/{psb_fb.h => framebuffer.h} | 4 ++--
 drivers/staging/gma500/mdfld_intel_display.c       | 2 +-
 drivers/staging/gma500/mrst_crtc.c                 | 2 +-
 drivers/staging/gma500/psb_2d.c                    | 3 +--
 drivers/staging/gma500/psb_drv.c                   | 2 +-
 drivers/staging/gma500/psb_intel_display.c         | 2 +-
 8 files changed, 9 insertions(+), 10 deletions(-)
 rename drivers/staging/gma500/{psb_fb.c => framebuffer.c} (99%)
 rename drivers/staging/gma500/{psb_fb.h => framebuffer.h} (96%)

diff --git a/drivers/staging/gma500/Makefile b/drivers/staging/gma500/Makefile
index 2ad6b1cf21b1..fb6040f01d75 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
similarity index 99%
rename from drivers/staging/gma500/psb_fb.c
rename to drivers/staging/gma500/framebuffer.c
index 17c3cf6388b5..716a7b979301 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
similarity index 96%
rename from drivers/staging/gma500/psb_fb.h
rename to drivers/staging/gma500/framebuffer.h
index ed6e856d3e1b..9416a2138f64 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 0b619b68642f..1447a5bc48bf 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 fb9f2a2ee774..d12d1a6af2b3 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 df4c519d100c..5ca4c4278c32 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 ba47178f6231..4114ffd74f18 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 6792d0c88b57..afd49a752151 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"