aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamian Hobson-Garcia <dhobsong@igel.co.jp>2011-06-22 01:49:50 -0400
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2011-08-19 02:11:16 -0400
commit0aa492be88b10b7b7621101df5fbf79f9236aecb (patch)
tree3376b14844a7efd37c52ecb69143524ef0f02a8d
parentec19b9e0fa808d82ad996d73358a5b06a565b78b (diff)
fbdev: sh_mobile_meram: Move private data from .h to .c
There is no reason for sh_mobile_meram_priv to be in the .h file since it should be private to sh_mobile_meram.c Signed-off-by: Damian Hobson-Garcia <dhobsong@igel.co.jp>
-rw-r--r--drivers/video/sh_mobile_meram.c8
-rw-r--r--drivers/video/sh_mobile_meram.h8
2 files changed, 8 insertions, 8 deletions
diff --git a/drivers/video/sh_mobile_meram.c b/drivers/video/sh_mobile_meram.c
index 34efd8a29f59..cfa1a78328aa 100644
--- a/drivers/video/sh_mobile_meram.c
+++ b/drivers/video/sh_mobile_meram.c
@@ -37,6 +37,14 @@
37#define MEQSEL1 0x40 37#define MEQSEL1 0x40
38#define MEQSEL2 0x44 38#define MEQSEL2 0x44
39 39
40struct sh_mobile_meram_priv {
41 void __iomem *base;
42 struct mutex lock;
43 unsigned long used_icb;
44 int used_meram_cache_regions;
45 unsigned long used_meram_cache[SH_MOBILE_MERAM_ICB_NUM];
46};
47
40/* settings */ 48/* settings */
41#define MERAM_SEC_LINE 15 49#define MERAM_SEC_LINE 15
42#define MERAM_LINE_WIDTH 2048 50#define MERAM_LINE_WIDTH 2048
diff --git a/drivers/video/sh_mobile_meram.h b/drivers/video/sh_mobile_meram.h
index 82c54fbce8bd..1615204b14de 100644
--- a/drivers/video/sh_mobile_meram.h
+++ b/drivers/video/sh_mobile_meram.h
@@ -17,14 +17,6 @@
17#define SH_MOBILE_MERAM_CACHE_OFFSET(p) ((p) >> 16) 17#define SH_MOBILE_MERAM_CACHE_OFFSET(p) ((p) >> 16)
18#define SH_MOBILE_MERAM_CACHE_SIZE(p) ((p) & 0xffff) 18#define SH_MOBILE_MERAM_CACHE_SIZE(p) ((p) & 0xffff)
19 19
20struct sh_mobile_meram_priv {
21 void __iomem *base;
22 struct mutex lock;
23 unsigned long used_icb;
24 int used_meram_cache_regions;
25 unsigned long used_meram_cache[SH_MOBILE_MERAM_ICB_NUM];
26};
27
28int sh_mobile_meram_alloc_icb(const struct sh_mobile_meram_cfg *cfg, 20int sh_mobile_meram_alloc_icb(const struct sh_mobile_meram_cfg *cfg,
29 int xres, 21 int xres,
30 int yres, 22 int yres,