The ps2esdi driver was marked as BROKEN more than two years ago due to being

[linux-2.6-omap-h63xx.git] / include / linux / isdn.h

diff --git a/include/linux/isdn.h b/include/linux/isdn.h
index d5dda4b643ac7a3dcb8f81c29492bfab63a5b3b7..9cb2855bb170d34cd4e0b1c6b812312befb3c035 100644 (file)
--- a/include/linux/isdn.h
+++ b/include/linux/isdn.h
@@ -167,6 +167,7 @@ typedef struct {
 #include <linux/etherdevice.h>
 #include <linux/skbuff.h>
 #include <linux/tcp.h>
+#include <linux/mutex.h>
 
 #define ISDN_TTY_MAJOR    43
 #define ISDN_TTYAUX_MAJOR 44
@@ -506,7 +507,6 @@ typedef struct modem_info {
   struct ktermios      normal_termios;  /* For saving termios structs     */
   struct ktermios      callout_termios;
   wait_queue_head_t    open_wait, close_wait;
-  struct semaphore      write_sem;
   spinlock_t           readlock;
 } modem_info;
 
@@ -616,7 +616,7 @@ typedef struct isdn_devt {
        int               v110emu[ISDN_MAX_CHANNELS]; /* V.110 emulator-mode 0=none */
        atomic_t          v110use[ISDN_MAX_CHANNELS]; /* Usage-Semaphore for stream */
        isdn_v110_stream  *v110[ISDN_MAX_CHANNELS];   /* V.110 private data         */
-       struct semaphore  sem;                        /* serialize list access*/
+       struct mutex      mtx;                        /* serialize list access*/
        unsigned long     global_features;
 } isdn_dev;