diff options
| author | Josh Boyer <jwboyer@redhat.com> | 2014-03-06 12:59:00 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@redhat.com> | 2014-03-06 12:59:44 -0500 |
| commit | e23ada199817b855a47229107c376689af21ee8c (patch) | |
| tree | 488e70956562d5acd804e76242987bb71be30345 /Bluetooth-allocate-static-minor-for-vhci.patch | |
| parent | 2432f55159f6523fca05ab466de7d3481a011b8d (diff) | |
| download | kernel-e23ada199817b855a47229107c376689af21ee8c.tar.gz kernel-e23ada199817b855a47229107c376689af21ee8c.tar.xz kernel-e23ada199817b855a47229107c376689af21ee8c.zip | |
Grab the entire bluetooth patch
Apparently cgit will limit a patch to just the file you happen to browse to.
How unhelpful of it.
Diffstat (limited to 'Bluetooth-allocate-static-minor-for-vhci.patch')
| -rw-r--r-- | Bluetooth-allocate-static-minor-for-vhci.patch | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/Bluetooth-allocate-static-minor-for-vhci.patch b/Bluetooth-allocate-static-minor-for-vhci.patch index 07c83c440..8acfb308f 100644 --- a/Bluetooth-allocate-static-minor-for-vhci.patch +++ b/Bluetooth-allocate-static-minor-for-vhci.patch @@ -25,8 +25,18 @@ Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Marcel Holtmann <marcel@holtmann.org> --- -(limited to 'drivers/bluetooth/hci_vhci.c') - +diff --git a/Documentation/devices.txt b/Documentation/devices.txt +index 10378cc..04356f5 100644 +--- a/Documentation/devices.txt ++++ b/Documentation/devices.txt +@@ -353,6 +353,7 @@ Your cooperation is appreciated. + 133 = /dev/exttrp External device trap + 134 = /dev/apm_bios Advanced Power Management BIOS + 135 = /dev/rtc Real Time Clock ++ 137 = /dev/vhci Bluetooth virtual HCI driver + 139 = /dev/openprom SPARC OpenBoot PROM + 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 1ef6990..add1c6a 100644 --- a/drivers/bluetooth/hci_vhci.c @@ -45,5 +55,17 @@ index 1ef6990..add1c6a 100644 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 3737f72..7bb6148 100644 +--- a/include/linux/miscdevice.h ++++ b/include/linux/miscdevice.h +@@ -23,6 +23,7 @@ + #define TEMP_MINOR 131 /* Temperature Sensor */ + #define RTC_MINOR 135 + #define EFI_RTC_MINOR 136 /* EFI Time services */ ++#define VHCI_MINOR 137 + #define SUN_OPENPROM_MINOR 139 + #define DMAPI_MINOR 140 /* DMAPI */ + #define NVRAM_MINOR 144 -- cgit v0.9.2 |