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 / zoran.h

diff --git a/drivers/media/video/zoran.h b/drivers/media/video/zoran.h
index 8656d58..0166f55 100644 (file)
--- a/drivers/media/video/zoran.h
+++ b/drivers/media/video/zoran.h
@@ -1,4 +1,4 @@
-/* 
+/*
  * zoran - Iomega Buz driver
  *
  * Copyright (C) 1999 Rainer Johanni <Rainer@Johanni.de>
@@ -395,7 +395,7 @@ struct zoran {
        struct videocodec *codec;       /* video codec */
        struct videocodec *vfe; /* video front end */
 
-       struct semaphore resource_lock; /* prevent evil stuff */
+       struct mutex resource_lock;     /* prevent evil stuff */
 
        u8 initialized;         /* flag if zoran has been correctly initalized */
        int user;               /* number of current users */
@@ -407,7 +407,7 @@ struct zoran {
        struct pci_dev *pci_dev;        /* PCI device */
        unsigned char revision; /* revision of zr36057 */
        unsigned int zr36057_adr;       /* bus address of IO mem returned by PCI BIOS */
-       unsigned char *zr36057_mem;     /* pointer to mapped IO memory */
+       unsigned char __iomem *zr36057_mem;/* pointer to mapped IO memory */
 
        spinlock_t spinlock;    /* Spinlock */
 
@@ -499,10 +499,10 @@ struct zoran {
   of _ALPHA_BUZ in the Makefile.*/
 
 #ifdef _ALPHA_BUZ
-#define btwrite(dat,adr)    writel((dat),(char *) (zr->zr36057_adr+(adr)))
+#define btwrite(dat,adr)    writel((dat), zr->zr36057_adr+(adr))
 #define btread(adr)         readl(zr->zr36057_adr+(adr))
 #else
-#define btwrite(dat,adr)    writel((dat), (char *) (zr->zr36057_mem+(adr)))
+#define btwrite(dat,adr)    writel((dat), zr->zr36057_mem+(adr))
 #define btread(adr)         readl(zr->zr36057_mem+(adr))
 #endif