From 14634e898130e00f6a17c74fc73ae3ec3963a7df Mon Sep 17 00:00:00 2001 From: Jingoo Han Date: Wed, 20 Feb 2013 13:13:42 +1100 Subject: [PATCH] video: s3c-fb: remove duplicated S3C_FB_MAX_WIN S3C_FB_MAX_WIN is already defined in 'plat-samsung/include/plat/fb.h'. So, this definition in 'include/video/samsung_fimd.h' should be removed to avoid the duplication. Signed-off-by: Jingoo Han Cc: Kyungmin Park Cc: Tomasz Figa Cc: Florian Tobias Schandinat Signed-off-by: Andrew Morton --- include/video/samsung_fimd.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/video/samsung_fimd.h b/include/video/samsung_fimd.h index e7554486a2b7..086525661c68 100644 --- a/include/video/samsung_fimd.h +++ b/include/video/samsung_fimd.h @@ -438,8 +438,6 @@ #define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0) #define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 0) -#define S3C_FB_MAX_WIN (5) /* number of hardware windows available. */ - /* Notes on per-window bpp settings * * Value Win0 Win1 Win2 Win3 Win 4 -- 2.39.5