summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/tuner.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index db62bae07..d16e65fab 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -1,5 +1,5 @@
-/* $Id: tuner.h,v 1.38 2005/07/02 14:53:02 nsh Exp $
+/* $Id: tuner.h,v 1.39 2005/07/02 15:24:11 nsh Exp $
*
tuner.h - definition for different tuners
@@ -161,14 +161,14 @@
enum tuner_admin_state {
T_UNINITIALIZED = 0,
- 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
+ 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
};
struct tuner_addr {
- enum tuner_admin_state v4l2_tuner;
+ enum tuner_admin_state state;
unsigned int type;
unsigned short addr;
};