Solve the definition conflict introduced by C2K header.
Change-Id: I501649760589aeeb861f3f194166fcd70b963819
diff --git a/drivers/media/dvb/frontends/zl10039.c b/drivers/media/dvb/frontends/zl10039.c
index c085e58..fbd3e8a 100644
--- a/drivers/media/dvb/frontends/zl10039.c
+++ b/drivers/media/dvb/frontends/zl10039.c
@@ -46,6 +46,21 @@
u8 id;
};
+// The following PLL0-3 could conflict with those in
+// arch/arm/mach-comcerto/include/mach/comcerto-2000/clk-rst.h
+// Hence undefine them.
+#ifdef PLL0
+#undef PLL0
+#endif /* PLL0 */
+#ifdef PLL1
+#undef PLL1
+#endif /* PLL1 */
+#ifdef PLL2
+#undef PLL2
+#endif /* PLL2 */
+#ifdef PLL3
+#undef PLL3
+#endif /* PLL3 */
enum zl10039_reg_addr {
PLL0 = 0,
PLL1,
