Skip to content

L
linux
Commit 585d4c8d authored by Marcel Holtmann's avatar Marcel Holtmann
Browse files
Options

Merge hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.5 

into hostme.bitkeeper.com:/ua/repos/l/linux-bt/marcel-2.5
parents dcfa61d5 18ab60bd
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 9 deletions
drivers/bluetooth/btuart_cs.c
View file @ 585d4c8d
...@@ -903,5 +903,3 @@ void __exit exit_btuart_cs(void) ...@@ -903,5 +903,3 @@ void __exit exit_btuart_cs(void)
module_init(init_btuart_cs); module_init(init_btuart_cs);
module_exit(exit_btuart_cs); module_exit(exit_btuart_cs);
EXPORT_NO_SYMBOLS;
net/bluetooth/rfcomm/tty.c
View file @ 585d4c8d
...@@ -854,7 +854,7 @@ static struct tty_driver rfcomm_tty_driver = { ...@@ -854,7 +854,7 @@ static struct tty_driver rfcomm_tty_driver = {
#ifdef CONFIG_DEVFS_FS #ifdef CONFIG_DEVFS_FS
.name = "bluetooth/rfcomm/%d", .name = "bluetooth/rfcomm/%d",
#else #else
.name = "rfcomm%d", .name = "rfcomm",
#endif #endif
.major = RFCOMM_TTY_MAJOR, .major = RFCOMM_TTY_MAJOR,
.minor_start = RFCOMM_TTY_MINOR, .minor_start = RFCOMM_TTY_MINOR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7