From f612b7a154f76df0b50f4f6aa306a47e4816f60c Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 25 Nov 2008 16:59:21 -0800
Subject: [PATCH] --- yaml --- r: 122175 b: refs/heads/master c:
 45555c0ed436b8b06eeaa5c524a3377e6d24fb45 h: refs/heads/master i:   122173:
 3013e378e4a185955134d0fe224c27011aa27737   122171:
 de38cd6dd2822dc9736e553863e174be2d92aa74   122167:
 ec7ef134c4a2860e34eea24e9ccc185519377108   122159:
 41c4d7389c6487d5a88449d0a52ee36de7f64bc0   122143:
 a3e2a6bd3e892e4c62d5fd290082b43ecff161b2   122111:
 5ca8caff03b2d6940d572238608bd91128b6a39a v: v3

---
 [refs]                            | 2 +-
 trunk/net/bluetooth/rfcomm/sock.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index aa3065a3fccb..a7094d2b2be0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff0db0490a2eb6db4f03870987c5c8e3dd81e747
+refs/heads/master: 45555c0ed436b8b06eeaa5c524a3377e6d24fb45
diff --git a/trunk/net/bluetooth/rfcomm/sock.c b/trunk/net/bluetooth/rfcomm/sock.c
index 8a972b6ba85f..bc0d4a7ce6ae 100644
--- a/trunk/net/bluetooth/rfcomm/sock.c
+++ b/trunk/net/bluetooth/rfcomm/sock.c
@@ -792,7 +792,9 @@ static int rfcomm_sock_getsockopt(struct socket *sock, int level, int optname, c
 
 static int rfcomm_sock_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
 {
+#if defined(CONFIG_BT_RFCOMM_TTY) || defined(CONFIG_BT_RFCOMM_DEBUG)
 	struct sock *sk = sock->sk;
+#endif
 	int err;
 
 	BT_DBG("sk %p cmd %x arg %lx", sk, cmd, arg);