From 5c06f7c9a23f600c206966f78b9b9f3ec10cd7eb Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Tue, 4 Oct 2005 12:22:16 +0100
Subject: [PATCH] --- yaml --- r: 10301 b: refs/heads/master c:
 d5919586265d36c6694a5d10ba589c02806873b6 h: refs/heads/master i:   10299:
 a008f6320f06c335bb2d266092aa134e1ada9376 v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/net/hamradio/mkiss.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 620aebff6ab1..8425c5d202b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96eb549c0c20cf63ca13fac71d9d406701f744a6
+refs/heads/master: d5919586265d36c6694a5d10ba589c02806873b6
diff --git a/trunk/drivers/net/hamradio/mkiss.c b/trunk/drivers/net/hamradio/mkiss.c
index 793ae12a2571..331a75c8aee2 100644
--- a/trunk/drivers/net/hamradio/mkiss.c
+++ b/trunk/drivers/net/hamradio/mkiss.c
@@ -622,7 +622,7 @@ static void ax_setup(struct net_device *dev)
  * best way to fix this is to use a rwlock in the tty struct, but for now we
  * use a single global rwlock for all ttys in ppp line discipline.
  */
-static rwlock_t disc_data_lock = RW_LOCK_UNLOCKED;
+static DEFINE_RWLOCK(disc_data_lock);
 
 static struct mkiss *mkiss_get(struct tty_struct *tty)
 {