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 /drivers/bluetooth/hci_vhci.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 'drivers/bluetooth/hci_vhci.c')
| -rw-r--r-- | drivers/bluetooth/hci_vhci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index 7320a71b6368..0bbefba6469c 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
| @@ -40,11 +40,6 @@ | |||
| 40 | #include <net/bluetooth/bluetooth.h> | 40 | #include <net/bluetooth/bluetooth.h> |
| 41 | #include <net/bluetooth/hci_core.h> | 41 | #include <net/bluetooth/hci_core.h> |
| 42 | 42 | ||
| 43 | #ifndef CONFIG_BT_HCIVHCI_DEBUG | ||
| 44 | #undef BT_DBG | ||
| 45 | #define BT_DBG(D...) | ||
| 46 | #endif | ||
| 47 | |||
| 48 | #define VERSION "1.2" | 43 | #define VERSION "1.2" |
| 49 | 44 | ||
| 50 | static int minor = MISC_DYNAMIC_MINOR; | 45 | static int minor = MISC_DYNAMIC_MINOR; |