diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-13 15:12:07 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-13 15:12:07 -0400 |
| commit | ec8eb9ae5819da011ac574aa290207a2a47cdbae (patch) | |
| tree | ff7045c38e56624fd886837620a54daf54b6ba2a /net/bluetooth/smp.c | |
| parent | 9330969b8fd1304fdcb7c1825f1528eea38d321c (diff) | |
| parent | 1d0c4da8f717937aeda47a72bc769d80f8776795 (diff) | |
| download | linux-ec8eb9ae5819da011ac574aa290207a2a47cdbae.tar.gz linux-ec8eb9ae5819da011ac574aa290207a2a47cdbae.tar.bz2 linux-ec8eb9ae5819da011ac574aa290207a2a47cdbae.zip | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'net/bluetooth/smp.c')
| -rw-r--r-- | net/bluetooth/smp.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/bluetooth/smp.c b/net/bluetooth/smp.c index 6fc7c4708f3e..ff4835b61de9 100644 --- a/net/bluetooth/smp.c +++ b/net/bluetooth/smp.c @@ -20,14 +20,15 @@ SOFTWARE IS DISCLAIMED. */ +#include <linux/crypto.h> +#include <linux/scatterlist.h> +#include <crypto/b128ops.h> + #include <net/bluetooth/bluetooth.h> #include <net/bluetooth/hci_core.h> #include <net/bluetooth/l2cap.h> #include <net/bluetooth/mgmt.h> #include <net/bluetooth/smp.h> -#include <linux/crypto.h> -#include <linux/scatterlist.h> -#include <crypto/b128ops.h> #define SMP_TIMEOUT msecs_to_jiffies(30000) |