From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 10 Sep 2012 02:10:07 +0000 (+1000)
Subject: Merge remote-tracking branch 'bluetooth/master'
X-Git-Tag: next-20120910~67
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b7724cb5934184a1052df087dc4625a9528b6e42;p=karo-tx-linux.git

Merge remote-tracking branch 'bluetooth/master'
---

b7724cb5934184a1052df087dc4625a9528b6e42
diff --cc net/bluetooth/hci_conn.c
index 3c094e78dde9,59f0344406c8..b9196a44f759
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@@ -29,9 -29,8 +29,9 @@@
  #include <net/bluetooth/bluetooth.h>
  #include <net/bluetooth/hci_core.h>
  #include <net/bluetooth/a2mp.h>
 +#include <net/bluetooth/smp.h>
  
- static void hci_le_connect(struct hci_conn *conn)
+ static void hci_le_create_connection(struct hci_conn *conn)
  {
  	struct hci_dev *hdev = conn->hdev;
  	struct hci_cp_le_create_conn cp;