summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-08-06 10:18:48 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-06 10:18:48 -0700
commitcd5098d254a28a5980bc6dec9644f99ee884a548 (patch)
tree4af4f1878367c88c9303d1b71e20c9b5aa47cb32 /include
parentd8588ee5b87226d96e07add42027246746357fe3 (diff)
parent576c7d858f36cab6110b29db7b53964d5132cf30 (diff)
downloadtalos-obmc-linux-cd5098d254a28a5980bc6dec9644f99ee884a548.tar.gz
talos-obmc-linux-cd5098d254a28a5980bc6dec9644f99ee884a548.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'include')
-rw-r--r--include/net/bluetooth/bluetooth.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h
index 42a84c53678b..06b24f637026 100644
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
@@ -57,12 +57,6 @@
#define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __FUNCTION__ , ## arg)
#define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __FUNCTION__ , ## arg)
-#ifdef HCI_DATA_DUMP
-#define BT_DMP(buf, len) bt_dump(__FUNCTION__, buf, len)
-#else
-#define BT_DMP(D...)
-#endif
-
extern struct proc_dir_entry *proc_bt;
/* Connection and socket states */
@@ -174,8 +168,6 @@ static inline int skb_frags_no(struct sk_buff *skb)
return n;
}
-void bt_dump(char *pref, __u8 *buf, int count);
-
int bt_err(__u16 code);
#endif /* __BLUETOOTH_H */
OpenPOWER on IntegriCloud