diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-06 10:18:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-06 10:18:48 -0700 |
| commit | cd5098d254a28a5980bc6dec9644f99ee884a548 (patch) | |
| tree | 4af4f1878367c88c9303d1b71e20c9b5aa47cb32 /drivers/bluetooth/hci_ldisc.c | |
| parent | d8588ee5b87226d96e07add42027246746357fe3 (diff) | |
| parent | 576c7d858f36cab6110b29db7b53964d5132cf30 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index f766bc22c6b..90be2eae52e 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -57,8 +57,6 @@ #ifndef CONFIG_BT_HCIUART_DEBUG #undef BT_DBG #define BT_DBG( A... ) -#undef BT_DMP -#define BT_DMP( A... ) #endif static int reset = 0; |