]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum
authorMauro Carvalho Chehab <mchehab@infradead.org>
Fri, 15 Feb 2008 21:41:06 +0000 (18:41 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Mon, 18 Feb 2008 15:18:28 +0000 (12:18 -0300)
commit6165894fb6293072848e5699f3fcbe88b7c60815
treee45c1c41a94683b25a3e7eb0250df836c92b8403
parentea35e3a754b2ba5f712c3f4df55e426ae2e4d60a
V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum

Thanks to Martin Michlmayr <tbm@cyrius.com> for reporting this issue:

The zoran driver fails to compile on the ARM Orion platform with:

In file included from drivers/media/video/zoran_procfs.c:50:
drivers/media/video/zoran.h:232: error: expected identifier before numeric
constant

The reason is that drivers/media/video/zoran.h defines an enum with
GPIO_MAX in it, but Orion contains a #define GPIO_MAX 32 in
include/asm-arm/arch-orion/orion.h

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
drivers/media/video/zoran.h
drivers/media/video/zoran_device.c