Jingoo Han 151b5c4699 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>		2013-02-21 17:22:18 -08:00
..
acpi	Merge branch 'acpi-cleanup'	2013-02-15 13:58:30 +01:00
asm-generic	The common clock framework changes for 3.9 are almost entirely fixes.	2013-02-20 11:02:10 -08:00
clocksource
crypto
drm	Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel	2013-01-11 07:52:48 +10:00
keys
linux	bug.h, compiler.h: introduce compiletime_assert & BUILD_BUG_ON_MSG	2013-02-21 17:22:16 -08:00
math-emu
media
memory
misc
net	ipv6: fix race condition regarding dst->expires and dst->from.	2013-02-20 15:11:45 -05:00
pcmcia
ras
rdma	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00
rxrpc
scsi	SCSI misc on 20121212	2012-12-13 19:20:31 -08:00
sound	Merge remote-tracking branch 'asoc/fix/cs4271' into tmp	2013-01-10 12:22:11 +00:00
target	target: Introduce TCM_NO_SENSE	2013-01-10 20:06:08 -08:00
trace	ACPI and power management updates for 3.9-rc1	2013-02-20 11:26:56 -08:00
uapi	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse	2013-02-21 09:03:54 -08:00
video	video: s3c-fb: remove duplicated S3C_FB_MAX_WIN	2013-02-21 17:22:18 -08:00
xen	Bugfixes:	2012-12-18 12:26:54 -08:00
Kbuild	UAPI: Remove empty Kbuild files	2013-01-02 17:36:10 -08:00