Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / media / video / saa7146.h

diff --git a/drivers/media/video/saa7146.h b/drivers/media/video/saa7146.h
index f305ec8..2830b5e 100644 (file)
--- a/drivers/media/video/saa7146.h
+++ b/drivers/media/video/saa7146.h
@@ -1,7 +1,7 @@
-/*  
+/*
     saa7146.h - definitions philips saa7146 based cards
     Copyright (C) 1999 Nathan Laredo (laredo@gnu.org)
-    
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -27,7 +27,7 @@
 
 #include <linux/videodev.h>
 
-#ifndef O_NONCAP  
+#ifndef O_NONCAP
 #define O_NONCAP       O_TRUNC
 #endif
 
@@ -36,7 +36,7 @@
 
 #ifdef __KERNEL__
 
-struct saa7146_window 
+struct saa7146_window
 {
        int x, y;
        ushort width, height;
@@ -70,10 +70,9 @@ struct saa7146
        int irqstate;           /* irq routine is state driven */
        int writemode;
        int playmode;
-        unsigned int nr;
+       unsigned int nr;
        unsigned long irq;          /* IRQ used by SAA7146 card */
        unsigned short id;
-       struct pci_dev *dev;
        unsigned char revision;
        unsigned char boardcfg[64];     /* 64 bytes of config from eeprom */
        unsigned long saa7146_adr;   /* bus address of IO mem from PCI BIOS */