Merge branch 'master' into csb1725

[mv-sheeva.git] / include / net / bluetooth / hci.h

diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h
index bcbdd6d4e6dd43f1dfb4196a5eb3998309cf5909..e30e00834340a1330e373d7397fadbbccb1f035f 100644 (file)
--- a/include/net/bluetooth/hci.h
+++ b/include/net/bluetooth/hci.h
@@ -54,7 +54,7 @@
 
 /* HCI controller types */
 #define HCI_BREDR      0x00
-#define HCI_80211      0x01
+#define HCI_AMP                0x01
 
 /* HCI device quirks */
 enum {