From cfba908b81b63d0e345c459dbdd546d41eb4e5ed Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sat, 8 Jul 2006 13:57:15 +0200
Subject: [PATCH] --- yaml --- r: 36806 b: refs/heads/master c:
 0ac53939a06c610b394aeb0211b985804f2d2da3 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/bluetooth/hci_vhci.c | 2 +-
 trunk/include/net/bluetooth/hci.h  | 3 ++-
 trunk/net/bluetooth/hci_sysfs.c    | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 3a37a22837d2..e162347f73bd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c724357f432df5ddc83a62c8168414a604cd420
+refs/heads/master: 0ac53939a06c610b394aeb0211b985804f2d2da3
diff --git a/trunk/drivers/bluetooth/hci_vhci.c b/trunk/drivers/bluetooth/hci_vhci.c
index fc2130f1776a..a278d98a9151 100644
--- a/trunk/drivers/bluetooth/hci_vhci.c
+++ b/trunk/drivers/bluetooth/hci_vhci.c
@@ -276,7 +276,7 @@ static int vhci_open(struct inode *inode, struct file *file)
 
 	data->hdev = hdev;
 
-	hdev->type = HCI_VHCI;
+	hdev->type = HCI_VIRTUAL;
 	hdev->driver_data = data;
 
 	hdev->open     = vhci_open_dev;
diff --git a/trunk/include/net/bluetooth/hci.h b/trunk/include/net/bluetooth/hci.h
index b2bdb1aa0429..fde08f452b59 100644
--- a/trunk/include/net/bluetooth/hci.h
+++ b/trunk/include/net/bluetooth/hci.h
@@ -44,12 +44,13 @@
 #define HCI_NOTIFY_VOICE_SETTING	3
 
 /* HCI device types */
-#define HCI_VHCI	0
+#define HCI_VIRTUAL	0
 #define HCI_USB		1
 #define HCI_PCCARD	2
 #define HCI_UART	3
 #define HCI_RS232	4
 #define HCI_PCI		5
+#define HCI_SDIO	6
 
 /* HCI device quirks */
 enum {
diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c
index 58df4360d242..09c61615e961 100644
--- a/trunk/net/bluetooth/hci_sysfs.c
+++ b/trunk/net/bluetooth/hci_sysfs.c
@@ -16,7 +16,7 @@
 static inline char *typetostr(int type)
 {
 	switch (type) {
-	case HCI_VHCI:
+	case HCI_VIRTUAL:
 		return "VIRTUAL";
 	case HCI_USB:
 		return "USB";
@@ -28,6 +28,8 @@ static inline char *typetostr(int type)
 		return "RS232";
 	case HCI_PCI:
 		return "PCI";
+	case HCI_SDIO:
+		return "SDIO";
 	default:
 		return "UNKNOWN";
 	}