summaryrefslogtreecommitdiffstats
path: root/linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch
diff options
context:
space:
mode:
Diffstat (limited to 'linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch')
-rw-r--r--linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch b/linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch
index 33a3fde..26a271c 100644
--- a/linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch
+++ b/linux-drd/0001-Bluetooth-allocate-static-minor-for-vhci.patch
@@ -1,9 +1,7 @@
-From a62207820fb65f168c8a7f9c0abb71d736f3d7e0 Mon Sep 17 00:00:00 2001
+From 5d77ba2d26110c678b40fd723866a17d4036de12 Mon Sep 17 00:00:00 2001
From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 18 Feb 2014 02:19:26 -0300
-Subject: [PATCH] Bluetooth: allocate static minor for vhci
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
+Subject: [PATCH 1/6] Bluetooth: allocate static minor for vhci
Commit bfacbb9 (Bluetooth: Use devname:vhci module alias for virtual HCI
driver) added the module alias to hci_vhci module so it's possible to
@@ -30,7 +28,7 @@ Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/Documentation/devices.txt b/Documentation/devices.txt
-index 80b7241..fce9398 100644
+index 10378cc..04356f5 100644
--- a/Documentation/devices.txt
+++ b/Documentation/devices.txt
@@ -353,6 +353,7 @@ Your cooperation is appreciated.
@@ -42,10 +40,10 @@ index 80b7241..fce9398 100644
140 = /dev/relay8 Berkshire Products Octal relay card
141 = /dev/relay16 Berkshire Products ISO-16 relay card
diff --git a/drivers/bluetooth/hci_vhci.c b/drivers/bluetooth/hci_vhci.c
-index 7b16738..59095e6 100644
+index 1ef6990..add1c6a 100644
--- a/drivers/bluetooth/hci_vhci.c
+++ b/drivers/bluetooth/hci_vhci.c
-@@ -352,7 +352,7 @@ static const struct file_operations vhci_fops = {
+@@ -359,7 +359,7 @@ static const struct file_operations vhci_fops = {
static struct miscdevice vhci_miscdev= {
.name = "vhci",
.fops = &vhci_fops,
@@ -54,13 +52,13 @@ index 7b16738..59095e6 100644
};
static int __init vhci_init(void)
-@@ -378,3 +378,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
+@@ -385,3 +385,4 @@ MODULE_DESCRIPTION("Bluetooth virtual HCI driver ver " VERSION);
MODULE_VERSION(VERSION);
MODULE_LICENSE("GPL");
MODULE_ALIAS("devname:vhci");
+MODULE_ALIAS_MISCDEV(VHCI_MINOR);
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
-index f7eaf2d..e5db611 100644
+index 3737f72..7bb6148 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -23,6 +23,7 @@
@@ -72,5 +70,5 @@ index f7eaf2d..e5db611 100644
#define DMAPI_MINOR 140 /* DMAPI */
#define NVRAM_MINOR 144
--
-1.9.0
+1.9.1