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 /net/bluetooth/bnep/netdev.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 'net/bluetooth/bnep/netdev.c')
| -rw-r--r-- | net/bluetooth/bnep/netdev.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 47e179f62e82..f897da6e0444 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c | |||
| @@ -41,11 +41,6 @@ | |||
| 41 | 41 | ||
| 42 | #include "bnep.h" | 42 | #include "bnep.h" |
| 43 | 43 | ||
| 44 | #ifndef CONFIG_BT_BNEP_DEBUG | ||
| 45 | #undef BT_DBG | ||
| 46 | #define BT_DBG( A... ) | ||
| 47 | #endif | ||
| 48 | |||
| 49 | #define BNEP_TX_QUEUE_LEN 20 | 44 | #define BNEP_TX_QUEUE_LEN 20 |
| 50 | 45 | ||
| 51 | static int bnep_net_open(struct net_device *dev) | 46 | static int bnep_net_open(struct net_device *dev) |