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 / isdn / icn / icn.h

diff --git a/drivers/isdn/icn/icn.h b/drivers/isdn/icn/icn.h
index 4ab15c9..7d7245f 100644 (file)
--- a/drivers/isdn/icn/icn.h
+++ b/drivers/isdn/icn/icn.h
@@ -35,7 +35,6 @@ typedef struct icn_cdef {
 #ifdef __KERNEL__
 /* Kernel includes */
 
-#include <linux/version.h>
 #include <linux/errno.h>
 #include <linux/fs.h>
 #include <linux/major.h>
@@ -70,8 +69,7 @@ typedef struct icn_cdef {
 #define ICN_FLAGS_RUNNING  4    /* Cards driver activated                  */
 #define ICN_FLAGS_RBTIMER  8    /* cyclic scheduling of B-Channel-poll     */
 
-#define ICN_BOOT_TIMEOUT1  (HZ) /* Delay for Boot-download (jiffies)       */
-#define ICN_CHANLOCK_DELAY (HZ/10)     /* Delay for Channel-mapping (jiffies)     */
+#define ICN_BOOT_TIMEOUT1  1000 /* Delay for Boot-download (msecs)         */
 
 #define ICN_TIMER_BCREAD (HZ/100)      /* B-Channel poll-cycle                    */
 #define ICN_TIMER_DCREAD (HZ/2) /* D-Channel poll-cycle                    */
@@ -175,7 +173,7 @@ typedef struct icn_card {
 typedef struct icn_dev {
        spinlock_t devlock;     /* spinlock to protect this struct  */
        unsigned long memaddr;  /* Address of memory mapped buffers */
-       icn_shmem *shmem;       /* Pointer to memory-mapped-buffers */
+       icn_shmem __iomem *shmem;       /* Pointer to memory-mapped-buffers */
        int mvalid;             /* IO-shmem has been requested      */
        int channel;            /* Currently mapped channel         */
        struct icn_card *mcard; /* Currently mapped card            */