From 67408d57dedfce1d252fb2c11524a827bca2364d Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@intel.com>
Date: Wed, 9 Nov 2011 13:58:56 +0200
Subject: [PATCH] --- yaml --- r: 277755 b: refs/heads/master c:
 fc2f4b13d8c91713efb972be42566f7f3625f5ed h: refs/heads/master i:   277753:
 c246c0002180d84c1ad2a47ecbfc2ff11eecc967   277751:
 9e8d72da0d6d611cda7d6bfc9c87b75792855e97 v: v3

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

diff --git a/[refs] b/[refs]
index b5fbeb0a99e2..121a9bb972f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e0f9309f371096b82ad35aa2c27d7f848f37e696
+refs/heads/master: fc2f4b13d8c91713efb972be42566f7f3625f5ed
diff --git a/trunk/net/bluetooth/mgmt.c b/trunk/net/bluetooth/mgmt.c
index 263fa2745d48..a849428ffbcb 100644
--- a/trunk/net/bluetooth/mgmt.c
+++ b/trunk/net/bluetooth/mgmt.c
@@ -36,7 +36,7 @@
 
 struct pending_cmd {
 	struct list_head list;
-	__u16 opcode;
+	u16 opcode;
 	int index;
 	void *param;
 	struct sock *sk;