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 92823211d0c5957989e02552de636f6cc5072886..e21b5735c1032c7b122950eb7faf07c2cdafa909 100644 (file)
--- a/drivers/media/video/planb.h
+++ b/drivers/media/video/planb.h
@@ -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;