Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6] / drivers / media / video / tuner-xc2028-types.h

diff --git a/drivers/media/video/tuner-xc2028-types.h b/drivers/media/video/tuner-xc2028-types.h
index c0dc6ec19f098fde1ca01eeaf32ba200c9135e2b..d0057fbf0ec72e9569a92b30121961663e371e3a 100644 (file)
--- a/drivers/media/video/tuner-xc2028-types.h
+++ b/drivers/media/video/tuner-xc2028-types.h
@@ -82,6 +82,9 @@
 #define INPUT2         (1 << 28)
 #define SCODE          (1 << 29)
 
+/* This flag identifies that the scode table has a new format */
+#define HAS_IF         (1 << 30)
+
 #define SCODE_TYPES    (MTS|DTV6|QAM|DTV7|DTV78|DTV8|LCD|NOGD|MONO|ATSC|IF| \
                         LG60|ATI638|OREN538|OREN36|TOYOTA388|TOYOTA794|     \
                         DIBCOM52|ZARLINK456|CHINA|F6MHZ|SCODE)