From 463eec284b2e6a697e33413fb03768c6af821ef7 Mon Sep 17 00:00:00 2001
From: Damian Hobson-Garcia <dhobsong@igel.co.jp>
Date: Wed, 22 Jun 2011 07:49:50 +0200
Subject: [PATCH] --- yaml --- r: 271280 b: refs/heads/master c:
 0aa492be88b10b7b7621101df5fbf79f9236aecb h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/video/sh_mobile_meram.c | 8 ++++++++
 trunk/drivers/video/sh_mobile_meram.h | 8 --------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 31cc9e1880db..57921a316257 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec19b9e0fa808d82ad996d73358a5b06a565b78b
+refs/heads/master: 0aa492be88b10b7b7621101df5fbf79f9236aecb
diff --git a/trunk/drivers/video/sh_mobile_meram.c b/trunk/drivers/video/sh_mobile_meram.c
index 34efd8a29f59..cfa1a78328aa 100644
--- a/trunk/drivers/video/sh_mobile_meram.c
+++ b/trunk/drivers/video/sh_mobile_meram.c
@@ -37,6 +37,14 @@
 #define MEQSEL1 0x40
 #define MEQSEL2 0x44
 
+struct sh_mobile_meram_priv {
+	void __iomem	*base;
+	struct mutex	lock;
+	unsigned long	used_icb;
+	int		used_meram_cache_regions;
+	unsigned long	used_meram_cache[SH_MOBILE_MERAM_ICB_NUM];
+};
+
 /* settings */
 #define MERAM_SEC_LINE 15
 #define MERAM_LINE_WIDTH 2048
diff --git a/trunk/drivers/video/sh_mobile_meram.h b/trunk/drivers/video/sh_mobile_meram.h
index 82c54fbce8bd..1615204b14de 100644
--- a/trunk/drivers/video/sh_mobile_meram.h
+++ b/trunk/drivers/video/sh_mobile_meram.h
@@ -17,14 +17,6 @@
 #define SH_MOBILE_MERAM_CACHE_OFFSET(p)	((p) >> 16)
 #define SH_MOBILE_MERAM_CACHE_SIZE(p)	((p) & 0xffff)
 
-struct sh_mobile_meram_priv {
-	void __iomem	*base;
-	struct mutex	lock;
-	unsigned long	used_icb;
-	int		used_meram_cache_regions;
-	unsigned long	used_meram_cache[SH_MOBILE_MERAM_ICB_NUM];
-};
-
 int sh_mobile_meram_alloc_icb(const struct sh_mobile_meram_cfg *cfg,
 		   int xres,
 		   int yres,