This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / media / video / bttv-if.c

diff --git a/drivers/media/video/bttv-if.c b/drivers/media/video/bttv-if.c
index 935feb7..74da711 100644 (file)
--- a/drivers/media/video/bttv-if.c
+++ b/drivers/media/video/bttv-if.c
@@ -1,6 +1,4 @@
 /*
-    $Id: bttv-if.c,v 1.3 2004/10/13 10:39:00 kraxel Exp $
-
     bttv-if.c  --  old gpio interface to other kernel modules
                    don't use in new code, will go away in 2.7
                   have a look at bttv-gpio.c instead.
@@ -24,7 +22,7 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    
 */
 
 #include <linux/module.h>
@@ -82,7 +80,7 @@ int bttv_gpio_enable(unsigned int card, unsigned long mask, unsigned long data)
        if (card >= bttv_num) {
                return -EINVAL;
        }
-
+       
        btv = &bttvs[card];
        gpio_inout(mask,data);
        if (bttv_gpio)
@@ -93,7 +91,7 @@ int bttv_gpio_enable(unsigned int card, unsigned long mask, unsigned long data)
 int bttv_read_gpio(unsigned int card, unsigned long *data)
 {
        struct bttv *btv;
-
+       
        if (card >= bttv_num) {
                return -EINVAL;
        }
@@ -104,7 +102,7 @@ int bttv_read_gpio(unsigned int card, unsigned long *data)
                return -ENODEV;
        }
 
-/* prior setting BT848_GPIO_REG_INP is (probably) not needed
+/* prior setting BT848_GPIO_REG_INP is (probably) not needed 
    because we set direct input on init */
        *data = gpio_read();
        return 0;
@@ -113,14 +111,14 @@ int bttv_read_gpio(unsigned int card, unsigned long *data)
 int bttv_write_gpio(unsigned int card, unsigned long mask, unsigned long data)
 {
        struct bttv *btv;
-
+       
        if (card >= bttv_num) {
                return -EINVAL;
        }
 
        btv = &bttvs[card];
 
-/* prior setting BT848_GPIO_REG_INP is (probably) not needed
+/* prior setting BT848_GPIO_REG_INP is (probably) not needed 
    because direct input is set on init */
        gpio_bits(mask,data);
        if (bttv_gpio)