diff options
-rw-r--r-- | drivers/bluetooth/hci_vhci.c | 2 | ||||
-rw-r--r-- | include/net/bluetooth/hci.h | 3 | ||||
-rw-r--r-- | net/bluetooth/hci_sysfs.c | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c index fc2130f1776a..a278d98a9151 100644 --- a/drivers/bluetooth/hci_vhci.c +++ b/drivers/bluetooth/hci_vhci.c | |||
@@ -276,7 +276,7 @@ static int vhci_open(struct inode *inode, struct file *file) | |||
276 | 276 | ||
277 | data->hdev = hdev; | 277 | data->hdev = hdev; |
278 | 278 | ||
279 | hdev->type = HCI_VHCI; | 279 | hdev->type = HCI_VIRTUAL; |
280 | hdev->driver_data = data; | 280 | hdev->driver_data = data; |
281 | 281 | ||
282 | hdev->open = vhci_open_dev; | 282 | hdev->open = vhci_open_dev; |
diff --git a/include/net/bluetooth/hci.h b/include/net/bluetooth/hci.h index b2bdb1aa0429..fde08f452b59 100644 --- a/include/net/bluetooth/hci.h +++ b/include/net/bluetooth/hci.h | |||
@@ -44,12 +44,13 @@ | |||
44 | #define HCI_NOTIFY_VOICE_SETTING 3 | 44 | #define HCI_NOTIFY_VOICE_SETTING 3 |
45 | 45 | ||
46 | /* HCI device types */ | 46 | /* HCI device types */ |
47 | #define HCI_VHCI 0 | 47 | #define HCI_VIRTUAL 0 |
48 | #define HCI_USB 1 | 48 | #define HCI_USB 1 |
49 | #define HCI_PCCARD 2 | 49 | #define HCI_PCCARD 2 |
50 | #define HCI_UART 3 | 50 | #define HCI_UART 3 |
51 | #define HCI_RS232 4 | 51 | #define HCI_RS232 4 |
52 | #define HCI_PCI 5 | 52 | #define HCI_PCI 5 |
53 | #define HCI_SDIO 6 | ||
53 | 54 | ||
54 | /* HCI device quirks */ | 55 | /* HCI device quirks */ |
55 | enum { | 56 | enum { |
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 58df4360d242..09c61615e961 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c | |||
@@ -16,7 +16,7 @@ | |||
16 | static inline char *typetostr(int type) | 16 | static inline char *typetostr(int type) |
17 | { | 17 | { |
18 | switch (type) { | 18 | switch (type) { |
19 | case HCI_VHCI: | 19 | case HCI_VIRTUAL: |
20 | return "VIRTUAL"; | 20 | return "VIRTUAL"; |
21 | case HCI_USB: | 21 | case HCI_USB: |
22 | return "USB"; | 22 | return "USB"; |
@@ -28,6 +28,8 @@ static inline char *typetostr(int type) | |||
28 | return "RS232"; | 28 | return "RS232"; |
29 | case HCI_PCI: | 29 | case HCI_PCI: |
30 | return "PCI"; | 30 | return "PCI"; |
31 | case HCI_SDIO: | ||
32 | return "SDIO"; | ||
31 | default: | 33 | default: |
32 | return "UNKNOWN"; | 34 | return "UNKNOWN"; |
33 | } | 35 | } |