diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-10 12:15:13 -0400 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-08-10 12:15:13 -0400 |
| commit | 2d610b80e954045ccfc27558f84e482709e5e5b7 (patch) | |
| tree | 840b3bb52adba07b6f1e4ddf2beb5ad5df480486 /drivers/bluetooth/hci_ldisc.c | |
| parent | 8a9cd6d676728792aaee31f30015d284acd154a3 (diff) | |
| parent | 86b3786078d63242d3194ffc58ae8dae1d1bbef3 (diff) | |
Merge with /home/shaggy/git/linus-clean/
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
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 f766bc22c6bb..90be2eae52e0 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
| @@ -57,8 +57,6 @@ | |||
| 57 | #ifndef CONFIG_BT_HCIUART_DEBUG | 57 | #ifndef CONFIG_BT_HCIUART_DEBUG |
| 58 | #undef BT_DBG | 58 | #undef BT_DBG |
| 59 | #define BT_DBG( A... ) | 59 | #define BT_DBG( A... ) |
| 60 | #undef BT_DMP | ||
| 61 | #define BT_DMP( A... ) | ||
| 62 | #endif | 60 | #endif |
| 63 | 61 | ||
| 64 | static int reset = 0; | 62 | static int reset = 0; |