diff options
| author |   John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /net/bluetooth/bnep/netdev.c | |
| parent | ip6mr: Add sizeof verification to MRT6_ASSERT and MT6_PIM (diff) | |
| parent | bcma: add more package IDs (diff) | |
| download | linux-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.xz linux-dev-79d38f7d6cf545ff838dd5227869f3916d1d100d.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/tx.c
Diffstat (limited to 'net/bluetooth/bnep/netdev.c')
| -rw-r--r-- | net/bluetooth/bnep/netdev.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c index 98f86f91d47c..e58c8b32589c 100644 --- a/net/bluetooth/bnep/netdev.c +++ b/net/bluetooth/bnep/netdev.c @@ -25,7 +25,6 @@ SOFTWARE IS DISCLAIMED. */ -#include <linux/export.h> #include <linux/etherdevice.h> #include <net/bluetooth/bluetooth.h> |