diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-07-08 00:53:00 +0000 |
| commit | b8553086288629b4efb77e97f5582e08bc50ad65 (patch) | |
| tree | 0a19bd1c21e148f35c7a0f76baa4f7a056b966b0 /drivers/char/ip2/i2os.h | |
| parent | 75b6d92f2dd5112b02f4e78cf9f35f9825946ef0 (diff) | |
Merge with 2.4.0-test3-pre4.
Diffstat (limited to 'drivers/char/ip2/i2os.h')
| -rw-r--r-- | drivers/char/ip2/i2os.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/ip2/i2os.h b/drivers/char/ip2/i2os.h index f85822c1a..8466d7747 100644 --- a/drivers/char/ip2/i2os.h +++ b/drivers/char/ip2/i2os.h @@ -27,6 +27,7 @@ #include "ip2types.h" #include <asm/io.h> /* For inb, etc */ +#include <linux/version.h> //------------------------------------ // Defines for I/O instructions: @@ -61,7 +62,7 @@ typedef int spinlock_t; //#define SAVE_AND_DISABLE_INTS(a,b) spin_lock_irqsave(a,b) //#define RESTORE_INTS(a,b) spin_unlock_irqrestore(a,b) -#define LOCK_INIT(a) spin_lock_init(a) +#define LOCK_INIT(a) rwlock_init(a) #define SAVE_AND_DISABLE_INTS(a,b) { \ /* printk("get_lock: 0x%x,%4d,%s\n",(int)a,__LINE__,__FILE__);*/ \ |