locks: allow lockd to process blocked locks during grace period

[safe/jmp/linux-2.6] / include / media / tuner.h

diff --git a/include/media/tuner.h b/include/media/tuner.h
index faacd2d..77068fc 100644 (file)
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -24,8 +24,6 @@
 
 #include <linux/videodev2.h>
 
-extern int tuner_debug;
-
 #define ADDR_UNSET (255)
 
 #define TUNER_TEMIC_PAL                        0        /* 4002 FH5 (3X 7756, 9483) */
@@ -80,7 +78,7 @@ extern int tuner_debug;
 
 #define TUNER_HITACHI_NTSC             40
 #define TUNER_PHILIPS_PAL_MK           41
-#define TUNER_PHILIPS_ATSC             42
+#define TUNER_PHILIPS_FCV1236D         42
 #define TUNER_PHILIPS_FM1236_MK3       43
 
 #define TUNER_PHILIPS_4IN1             44      /* ATI TV Wonder Pro - Conexant */
@@ -123,8 +121,7 @@ extern int tuner_debug;
 #define TUNER_SAMSUNG_TCPG_6121P30A     73     /* Hauppauge PVR-500 PAL */
 #define TUNER_TDA9887                   74      /* This tuner should be used only internally */
 #define TUNER_TEA5761                  75      /* Only FM Radio Tuner */
-
-#define TUNER_PHILIPS_TDA8295           76
+#define TUNER_XC5000                   76      /* Xceive Silicon Tuner */
 
 /* tv card specific */
 #define TDA9887_PRESENT                (1<<0)