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

[linux-2.6] / drivers / media / video / tda8290.h

diff --git a/drivers/media/video/tda8290.h b/drivers/media/video/tda8290.h
index 4c547577e7cabbdf3965fd1d6962fb13f918e365..dc8ef310b7b26b1fbccc6e24d321eb70d63caba2 100644 (file)
--- a/drivers/media/video/tda8290.h
+++ b/drivers/media/video/tda8290.h
@@ -20,10 +20,13 @@
 #include <linux/i2c.h>
 #include "dvb_frontend.h"
 
-struct tda829x_config
-{
+struct tda829x_config {
        unsigned int *lna_cfg;
        int (*tuner_callback) (void *dev, int command, int arg);
+
+       unsigned int probe_tuner:1;
+#define TDA829X_PROBE_TUNER 0
+#define TDA829X_DONT_PROBE  1
 };
 
 #if defined(CONFIG_TUNER_TDA8290) || (defined(CONFIG_TUNER_TDA8290_MODULE) && defined(MODULE))