From 8180c678468bb4d2dedb1e0d9acaf3f87ebddb79 Mon Sep 17 00:00:00 2001
From: Szymon Janc <szymon.janc@tieto.com>
Date: Thu, 17 Feb 2011 14:16:32 +0100
Subject: [PATCH] --- yaml --- r: 237407 b: refs/heads/master c:
 7235975383785276bdcfc13dd73cc87739cd25d0 h: refs/heads/master i:   237405:
 a0b44ebab8c25f04e0b0c0df99cad6c250cb2fa6   237403:
 3c027cfaf6172cc8ac8cd4a65bce013d78d766f1   237399:
 c9a2355d66178474e51ca30e76ff6ed21597427b   237391:
 8a378732d289bb933533a91c42bd94d160e2e5dd   237375:
 e6ecb0921abe6be71e2df47d80b98e5d1f259341 v: v3

---
 [refs]                     | 2 +-
 trunk/net/bluetooth/mgmt.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 653fecc40efb..1e1191d19969 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ce603ebe1f1420c7c5b013638ec29b4fc975180
+refs/heads/master: 7235975383785276bdcfc13dd73cc87739cd25d0
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index b2bda83050a4..f5ef7a3374c7 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -22,7 +22,7 @@
 
 /* Bluetooth HCI Management interface */
 
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/unaligned.h>
 
 #include <net/bluetooth/bluetooth.h>