From 5271a440bea9e2c5b5ed58313ec6afddf04f189a Mon Sep 17 00:00:00 2001
From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 24 Aug 2012 15:18:25 +0200
Subject: [PATCH] --- yaml --- r: 327138 b: refs/heads/master c:
 19d331010636a43318c09fbdaa5ae7ef4bb6f7eb h: refs/heads/master v: v3

---
 [refs]                                                          | 2 +-
 trunk/arch/arm/mach-vt8500/devices.c                            | 2 +-
 trunk/drivers/video/vt8500lcdfb.c                               | 2 +-
 trunk/drivers/video/wm8505fb.c                                  | 2 +-
 .../linux/platform_data/video-vt8500lcdfb.h}                    | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename trunk/{arch/arm/mach-vt8500/include/mach/vt8500fb.h => include/linux/platform_data/video-vt8500lcdfb.h} (100%)

diff --git a/[refs] b/[refs]
index 4c3f00f2546d..abd5ae1d44b5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e35742b034a29a1c00f12ab6d0a7ab779abc8f83
+refs/heads/master: 19d331010636a43318c09fbdaa5ae7ef4bb6f7eb
diff --git a/trunk/arch/arm/mach-vt8500/devices.c b/trunk/arch/arm/mach-vt8500/devices.c
index 1fcdc36b358d..82b4bcedffba 100644
--- a/trunk/arch/arm/mach-vt8500/devices.c
+++ b/trunk/arch/arm/mach-vt8500/devices.c
@@ -23,7 +23,7 @@
 
 #include <asm/mach/arch.h>
 
-#include <mach/vt8500fb.h>
+#include <linux/platform_data/video-vt8500lcdfb.h>
 #include <mach/i8042.h>
 #include "devices.h"
 
diff --git a/trunk/drivers/video/vt8500lcdfb.c b/trunk/drivers/video/vt8500lcdfb.c
index 2a5fe6ede845..66a74f9073fb 100644
--- a/trunk/drivers/video/vt8500lcdfb.c
+++ b/trunk/drivers/video/vt8500lcdfb.c
@@ -30,7 +30,7 @@
 #include <linux/platform_device.h>
 #include <linux/wait.h>
 
-#include <mach/vt8500fb.h>
+#include <linux/platform_data/video-vt8500lcdfb.h>
 
 #include "vt8500lcdfb.h"
 #include "wmt_ge_rops.h"
diff --git a/trunk/drivers/video/wm8505fb.c b/trunk/drivers/video/wm8505fb.c
index c8703bd61b74..ffeff4838120 100644
--- a/trunk/drivers/video/wm8505fb.c
+++ b/trunk/drivers/video/wm8505fb.c
@@ -29,7 +29,7 @@
 #include <linux/platform_device.h>
 #include <linux/wait.h>
 
-#include <mach/vt8500fb.h>
+#include <linux/platform_data/video-vt8500lcdfb.h>
 
 #include "wm8505fb_regs.h"
 #include "wmt_ge_rops.h"
diff --git a/trunk/arch/arm/mach-vt8500/include/mach/vt8500fb.h b/trunk/include/linux/platform_data/video-vt8500lcdfb.h
similarity index 100%
rename from trunk/arch/arm/mach-vt8500/include/mach/vt8500fb.h
rename to trunk/include/linux/platform_data/video-vt8500lcdfb.h