From 52cebc02f4964ec424dbb0256583e04af99ceefe Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 7 Jun 2009 18:09:57 +0200
Subject: [PATCH] --- yaml --- r: 150855 b: refs/heads/master c:
 ac28494c51ad20c7ff9cb991eaeee359a500d88e h: refs/heads/master i:   150853:
 210801c158de54f333afedf907d02e158778d0fa   150851:
 98fe18d03c537ad3ef95cc5c8ba64fc319791a88   150847:
 773e615debdd0719cfab87dfe8e7d81bcc47dfff v: v3

---
 [refs]                             |  2 +-
 trunk/drivers/bluetooth/hci_vhci.c | 12 ++++--------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 773759619c65..bdfcc77f7db8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b4324b5dc5b62ba76372e1bf8927230cf744df66
+refs/heads/master: ac28494c51ad20c7ff9cb991eaeee359a500d88e
diff --git a/trunk/drivers/bluetooth/hci_vhci.c b/trunk/drivers/bluetooth/hci_vhci.c
index 0bbefba6469c..379d3025cf33 100644
--- a/trunk/drivers/bluetooth/hci_vhci.c
+++ b/trunk/drivers/bluetooth/hci_vhci.c
@@ -40,7 +40,7 @@
 #include <net/bluetooth/bluetooth.h>
 #include <net/bluetooth/hci_core.h>
 
-#define VERSION "1.2"
+#define VERSION "1.3"
 
 static int minor = MISC_DYNAMIC_MINOR;
 
@@ -342,16 +342,15 @@ static const struct file_operations vhci_fops = {
 };
 
 static struct miscdevice vhci_miscdev= {
-	.name		= "vhci",
-	.fops		= &vhci_fops,
+	.name	= "vhci",
+	.fops	= &vhci_fops,
+	.minor	= MISC_DYNAMIC_MINOR,
 };
 
 static int __init vhci_init(void)
 {
 	BT_INFO("Virtual HCI driver ver %s", VERSION);
 
-	vhci_miscdev.minor = minor;
-
 	if (misc_register(&vhci_miscdev) < 0) {
 		BT_ERR("Can't register misc device with minor %d", minor);
 		return -EIO;
@@ -369,9 +368,6 @@ static void __exit vhci_exit(void)
 module_init(vhci_init);
 module_exit(vhci_exit);
 
-module_param(minor, int, 0444);
-MODULE_PARM_DESC(minor, "Miscellaneous minor device number");
-
 MODULE_AUTHOR("Marcel Holtmann <marcel@holtmann.org>");
 MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
 MODULE_VERSION(VERSION);