From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 30 Nov 2008 11:17:19 +0000 (+0100)
Subject: Bluetooth: Fix warnings for bt_key_strings and bt_slock_key_strings
X-Git-Tag: v2.6.29-rc1~581^2~343^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=db7aa1c203d477351ed1b8f394b40d9df06ddfc4;p=pandora-kernel.git

Bluetooth: Fix warnings for bt_key_strings and bt_slock_key_strings

After adding proper lockdep annotations for Bluetooth protocols the case
when lockdep is disabled produced two compiler warnings:

net/bluetooth/af_bluetooth.c:60: warning: ‘bt_key_strings’ defined but not used
net/bluetooth/af_bluetooth.c:71: warning: ‘bt_slock_key_strings’ defined but not used

Fix both of them by adding a CONFIG_DEBUG_LOCK_ALLOC conditional around
them and re-arranging the code a little bit.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
---

Reading git-diff-tree failed