Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[pandora-kernel.git] / drivers / media / video / planb.h

diff --git a/drivers/media/video/planb.h b/drivers/media/video/planb.h
index 9282321..e21b573 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;