summaryrefslogtreecommitdiff
path: root/include/media/tuner.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-02-14 18:53:12 -0200
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 20:32:03 -0300
commit2d351df443b0b324a440b5fd053074562d36a7f5 (patch)
tree911ffeb44059127e4524898bddfc82cb50822fb5 /include/media/tuner.h
parent0ae79d993cd5ce425bedebcbd2f8c4fa310acfe6 (diff)
downloadlwn-2d351df443b0b324a440b5fd053074562d36a7f5.tar.gz
lwn-2d351df443b0b324a440b5fd053074562d36a7f5.zip
[media] Remove the remaining usages for T_STANDBY
tda9887 used to use the T_STANDBY type internally, while tea5761 used it to put the device to sleep. Fix the code for it to work properly with the tuner core changes and remove this flag from tuner.h. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media/tuner.h')
-rw-r--r--include/media/tuner.h12
1 files changed, 1 insertions, 11 deletions
diff --git a/include/media/tuner.h b/include/media/tuner.h
index 1d596427d124..32dfd5f33cd7 100644
--- a/include/media/tuner.h
+++ b/include/media/tuner.h
@@ -21,6 +21,7 @@
#ifndef _TUNER_H
#define _TUNER_H
+#ifdef __KERNEL__
#include <linux/videodev2.h>
@@ -157,13 +158,10 @@
#define TDA9887_GAIN_NORMAL (1<<20)
#define TDA9887_RIF_41_3 (1<<21) /* radio IF1 41.3 vs 33.3 */
-#ifdef __KERNEL__
-
enum tuner_mode {
T_RADIO = 1 << V4L2_TUNER_RADIO,
T_ANALOG_TV = 1 << V4L2_TUNER_ANALOG_TV,
T_DIGITAL_TV = 1 << V4L2_TUNER_DIGITAL_TV,
- T_STANDBY = 1 << 31
};
/* Older boards only had a single tuner device. Nowadays multiple tuner
@@ -193,11 +191,3 @@ struct tuner_setup {
#endif /* __KERNEL__ */
#endif /* _TUNER_H */
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-basic-offset: 8
- * End:
- */