diff options
author | David S. Miller <davem@davemloft.net> | 2008-12-02 22:38:02 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-02 22:38:02 -0800 |
commit | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (patch) | |
tree | 628bc741d82a85f4c93190d38df5633d9c508b58 /net/bluetooth/hci_sock.c | |
parent | aa2ba5f1082dc705745899584aac8416d710c056 (diff) | |
parent | 9a5df92374d65e2886b92e98dd7d873c533a83ff (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/hci_sock.c')
-rw-r--r-- | net/bluetooth/hci_sock.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index d62579b6795..4f9621f759a 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c @@ -49,11 +49,6 @@ #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> -#ifndef CONFIG_BT_HCI_SOCK_DEBUG -#undef BT_DBG -#define BT_DBG(D...) -#endif - /* ----- HCI socket interface ----- */ static inline int hci_test_bit(int nr, void *addr) |