From a3a954f470bc6f2ce8de3296cae025627f5b0c6a Mon Sep 17 00:00:00 2001
From: "Nickolay V. Shmyrev" <devnull@localhost>
Date: Sat, 2 Jul 2005 15:24:11 +0000
Subject: 	* bttv-cards.c, bttv-i2c.c, cx88-i2c.c, cx88-video.c: 	*
 saa7134-cards.c, saa7134-core.c, saa7134-i2c.c: 	* tuner-core.c,
 tuner.h:

	Rename v4l2_tuner field in tun_addr structure. Cleanup
	tuner private calls.
---
 linux/include/media/tuner.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'linux/include')

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;
 };
-- 
cgit v1.2.3