Commit 151b5c46 authored Feb 21, 2013 by Jingoo Han Committed by Linus Torvalds Feb 21, 2013

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>

parent 4e45a765

include/video/samsung_fimd.h

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -438,8 +438,6 @@
	#define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0)		#define BLENDCON_NEW_8BIT_ALPHA_VALUE (1 << 0)
	#define BLENDCON_NEW_4BIT_ALPHA_VALUE (0 << 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		/* Notes on per-window bpp settings
	*		*
	* Value Win0 Win1 Win2 Win3 Win 4		* Value Win0 Win1 Win2 Win3 Win 4