From dd3cc7aa7e9594ed4f52b0274f71c310b68c3b39 Mon Sep 17 00:00:00 2001 From: Ben Dooks Date: Thu, 13 May 2010 14:44:50 +0900 Subject: [PATCH] --- yaml --- r: 192042 b: refs/heads/master c: f077f3fc055b329787783a1ab0efb9a8f8ecc874 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-samsung/dev-fb.c | 1 - trunk/arch/arm/plat-samsung/include/plat/fb.h | 7 +++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb634de8375c..27d6beefdac5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: dc5d2e8236e2eec461e8c34d302635142e93ab49 +refs/heads/master: f077f3fc055b329787783a1ab0efb9a8f8ecc874 diff --git a/trunk/arch/arm/plat-samsung/dev-fb.c b/trunk/arch/arm/plat-samsung/dev-fb.c index 002a15f313f3..bf60204c6297 100644 --- a/trunk/arch/arm/plat-samsung/dev-fb.c +++ b/trunk/arch/arm/plat-samsung/dev-fb.c @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/trunk/arch/arm/plat-samsung/include/plat/fb.h b/trunk/arch/arm/plat-samsung/include/plat/fb.h index ffc01a76b7ce..1f85649d8c18 100644 --- a/trunk/arch/arm/plat-samsung/include/plat/fb.h +++ b/trunk/arch/arm/plat-samsung/include/plat/fb.h @@ -15,6 +15,13 @@ #ifndef __PLAT_S3C_FB_H #define __PLAT_S3C_FB_H __FILE__ +/* S3C_FB_MAX_WIN + * Set to the maximum number of windows that any of the supported hardware + * can use. Since the platform data uses this for an array size, having it + * set to the maximum of any version of the hardware can do is safe. + */ +#define S3C_FB_MAX_WIN (5) + /** * struct s3c_fb_pd_win - per window setup data * @win_mode: The display parameters to initialise (not for window 0)