From: Mauro Carvalho Chehab <mchehab@infradead.org>
Date: Fri, 15 Feb 2008 21:41:06 +0000 (-0300)
Subject: V4L/DVB (7219): zoran: Fix namespace conflicts with Zoran 'GPIO_MAX' enum
X-Git-Tag: v2.6.25-rc3~132^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6165894fb6293072848e5699f3fcbe88b7c60815;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed