Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

[linux-2.6-omap-h63xx.git] / drivers / media / video / planb.h

diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h
index 79b6b561426eb68ba24dd5268e915e504c1c566d..e21b5735c1032c7b122950eb7faf07c2cdafa909 100644 (file)
--- a/drivers/media/video/planb.h
+++ b/drivers/media/video/planb.h
@@ -1,4 +1,4 @@
-/* 
+/*
     planb - PlanB frame grabber driver
 
     PlanB is used in the 7x00/8x00 series of PowerMacintosh
@@ -167,7 +167,7 @@ struct planb {
        struct  video_device video_dev;
        struct  video_picture picture;          /* Current picture params */
        struct  video_audio audio_dev;          /* Current audio params */
-  
+
        volatile struct planb_registers *planb_base;    /* virt base of planb */
        struct planb_registers *planb_base_phys;        /* phys base of planb */
        void    *priv_space;                    /* Org. alloc. mem for kfree */
@@ -177,6 +177,7 @@ struct planb {
        struct mutex lock;
        unsigned int    irq;                    /* interrupt number */
        volatile unsigned int intr_mask;
+       struct pci_dev *dev;                    /* Our PCI device */
 
        int     overlay;                        /* overlay running? */
        struct  planb_window win;
@@ -209,7 +210,7 @@ struct planb {
        int gwidth[MAX_GBUFFERS], gheight[MAX_GBUFFERS];
        unsigned int gfmt[MAX_GBUFFERS];
        int gnorm_switch[MAX_GBUFFERS];
-        volatile unsigned int *frame_stat;
+       volatile unsigned int *frame_stat;
 #define GBUFFER_UNUSED       0x00U
 #define GBUFFER_GRABBING     0x01U
 #define GBUFFER_DONE         0x02U