diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /net/bluetooth/bnep/sock.c | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'net/bluetooth/bnep/sock.c')
| -rw-r--r-- | net/bluetooth/bnep/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/bnep/sock.c b/net/bluetooth/bnep/sock.c index 2ff6ac7b2ed4..2862f53b66b1 100644 --- a/net/bluetooth/bnep/sock.c +++ b/net/bluetooth/bnep/sock.c | |||
| @@ -30,7 +30,6 @@ | |||
| 30 | #include <linux/capability.h> | 30 | #include <linux/capability.h> |
| 31 | #include <linux/errno.h> | 31 | #include <linux/errno.h> |
| 32 | #include <linux/kernel.h> | 32 | #include <linux/kernel.h> |
| 33 | #include <linux/slab.h> | ||
| 34 | #include <linux/poll.h> | 33 | #include <linux/poll.h> |
| 35 | #include <linux/fcntl.h> | 34 | #include <linux/fcntl.h> |
| 36 | #include <linux/skbuff.h> | 35 | #include <linux/skbuff.h> |
| @@ -39,6 +38,7 @@ | |||
| 39 | #include <linux/file.h> | 38 | #include <linux/file.h> |
| 40 | #include <linux/init.h> | 39 | #include <linux/init.h> |
| 41 | #include <linux/compat.h> | 40 | #include <linux/compat.h> |
| 41 | #include <linux/gfp.h> | ||
| 42 | #include <net/sock.h> | 42 | #include <net/sock.h> |
| 43 | 43 | ||
| 44 | #include <asm/system.h> | 44 | #include <asm/system.h> |