diff options
| author | Jingoo Han <jg1.han@samsung.com> | 2013-02-22 01:42:31 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-22 02:22:18 +0100 |
| commit | 151b5c469905fe30efad3a3d0ddffdb6c6ac1851 (patch) | |
| tree | 7b2b2155e5bcc5ce01defbc92b64f1d9bfa06749 /include/video | |
| parent | video: s3c-fb: use ARCH_ dependancy (diff) | |
| download | linux-151b5c469905fe30efad3a3d0ddffdb6c6ac1851.tar.xz linux-151b5c469905fe30efad3a3d0ddffdb6c6ac1851.zip | |
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 <jg1.han@samsung.com>
Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Tomasz Figa <t.figa@samsung.com>
Cc: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/video')
| -rw-r--r-- | include/video/samsung_fimd.h | 2 |
1 files changed, 0 insertions, 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 |