diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-06-17 13:25:08 +0000 |
| commit | 59223edaa18759982db0a8aced0e77457d10c68e (patch) | |
| tree | 89354903b01fa0a447bffeefe00df3044495db2e /include/asm-m68k/semaphore.h | |
| parent | db7d4daea91e105e3859cf461d7e53b9b77454b2 (diff) | |
Merge with Linux 2.3.6. Sorry, this isn't tested on silicon, I don't
have a MIPS box at hand.
Diffstat (limited to 'include/asm-m68k/semaphore.h')
| -rw-r--r-- | include/asm-m68k/semaphore.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-m68k/semaphore.h b/include/asm-m68k/semaphore.h index 271169bbc..e1bdb10f4 100644 --- a/include/asm-m68k/semaphore.h +++ b/include/asm-m68k/semaphore.h @@ -1,7 +1,6 @@ #ifndef _M68K_SEMAPHORE_H #define _M68K_SEMAPHORE_H -#include <linux/config.h> #include <linux/linkage.h> #include <asm/system.h> @@ -19,7 +18,7 @@ struct semaphore { atomic_t count; atomic_t waking; - struct wait_queue * wait; + wait_queue_head_t wait; }; #define MUTEX ((struct semaphore) { ATOMIC_INIT(1), ATOMIC_INIT(0), NULL }) |