Pull virt-cpu-accounting into release branch

[linux-2.6-omap-h63xx.git] / drivers / char / rio / host.h

diff --git a/drivers/char/rio/host.h b/drivers/char/rio/host.h
index ee2ddea7a63a838e084f1103f7df5147f2b417f0..78f24540c224583deae9d7ccec68ed49dcdb7025 100644 (file)
--- a/drivers/char/rio/host.h
+++ b/drivers/char/rio/host.h
@@ -44,6 +44,7 @@
 **    the host.
 */
 struct Host {
+       struct pci_dev *pdev;
        unsigned char Type;             /* RIO_EISA, RIO_MCA, ... */
        unsigned char Ivec;             /* POLLED or ivec number */
        unsigned char Mode;             /* Control stuff */
@@ -98,7 +99,7 @@ struct Host {
        struct UnixRup UnixRups[MAX_RUP + LINKS_PER_UNIT];
        int timeout_id;                         /* For calling 100 ms delays */
        int timeout_sem;                        /* For calling 100 ms delays */
-       long locks;                             /* long req'd for set_bit --RR */
+       unsigned long locks;                    /* long req'd for set_bit --RR */
        char ____end_marker____;
 };
 #define Control      CardP->DpControl