diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-04-07 23:30:53 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-04-07 23:30:53 +0400 |
| commit | f3b3e36f4ecad9fd7b0ae04d7400f2153a7834eb (patch) | |
| tree | 94417c101111e299fecd93ff41b2304e47e59e2c /net/bluetooth/cmtp/sock.c | |
| parent | b0006e69615868f3dfdfe2bd64eb11973f1208fc (diff) | |
| parent | db940cb0db7c69a217661ecd49e1e6b0d680a6cc (diff) | |
| download | linux-f3b3e36f4ecad9fd7b0ae04d7400f2153a7834eb.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padovan/bluetooth-next-2.6
Diffstat (limited to 'net/bluetooth/cmtp/sock.c')
| -rw-r--r-- | net/bluetooth/cmtp/sock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/cmtp/sock.c b/net/bluetooth/cmtp/sock.c index 7ea1979a8e4f..3f2dd5c25ae5 100644 --- a/net/bluetooth/cmtp/sock.c +++ b/net/bluetooth/cmtp/sock.c @@ -34,12 +34,12 @@ #include <linux/file.h> #include <linux/compat.h> #include <linux/gfp.h> +#include <linux/uaccess.h> #include <net/sock.h> #include <linux/isdn/capilli.h> #include <asm/system.h> -#include <asm/uaccess.h> #include "cmtp.h" |