diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-03 01:38:02 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-03 01:38:02 -0500 |
| commit | 3f8c6c9c7739d18e4b75902fdcbf6c3ba98dc123 (patch) | |
| tree | 628bc741d82a85f4c93190d38df5633d9c508b58 /include/net | |
| 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 'include/net')
| -rw-r--r-- | include/net/bluetooth/bluetooth.h | 4 | ||||
| -rw-r--r-- | include/net/bluetooth/hci.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/net/bluetooth/bluetooth.h b/include/net/bluetooth/bluetooth.h index 996d12df7594..a04f8463ac7e 100644 --- a/include/net/bluetooth/bluetooth.h +++ b/include/net/bluetooth/bluetooth.h | |||
| @@ -54,8 +54,8 @@ | |||
| 54 | #define SOL_RFCOMM 18 | 54 | #define SOL_RFCOMM 18 |
| 55 | 55 | ||
| 56 | #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg) | 56 | #define BT_INFO(fmt, arg...) printk(KERN_INFO "Bluetooth: " fmt "\n" , ## arg) |
| 57 | #define BT_DBG(fmt, arg...) printk(KERN_INFO "%s: " fmt "\n" , __func__ , ## arg) | 57 | #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg) |
| 58 | #define BT_ERR(fmt, arg...) printk(KERN_ERR "%s: " fmt "\n" , __func__ , ## arg) | 58 | #define BT_DBG(fmt, arg...) pr_debug("%s: " fmt "\n" , __func__ , ## arg) |
| 59 | 59 | ||
| 60 | /* Connection and socket states */ | 60 | /* Connection and socket states */ |
| 61 | enum { | 61 | enum { |
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index 3cc294919312..3645139e68c7 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | 54 | ||
| 55 | /* HCI device quirks */ | 55 | /* HCI device quirks */ |
| 56 | enum { | 56 | enum { |
| 57 | HCI_QUIRK_RESET_ON_INIT, | 57 | HCI_QUIRK_NO_RESET, |
| 58 | HCI_QUIRK_RAW_DEVICE, | 58 | HCI_QUIRK_RAW_DEVICE, |
| 59 | HCI_QUIRK_FIXUP_BUFFER_SIZE | 59 | HCI_QUIRK_FIXUP_BUFFER_SIZE |
| 60 | }; | 60 | }; |