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

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

Merge hostme.bitkeeper.com:/ua/repos/l/linux-bt/bt-2.5
into hostme.bitkeeper.com:/ua/repos/l/linux-bt/marcel-2.5
585d4c8d · Marcel Holtmann · dcfa61d5 · 18ab60bd · 585d4c8d · 585d4c8d
Commit 585d4c8d authored Dec 09, 2002 by Marcel Holtmann
Showing with 7 additions and 9 deletions

drivers/bluetooth/Kconfig drivers/bluetooth/Kconfig +6 -6

drivers/bluetooth/btuart_cs.c drivers/bluetooth/btuart_cs.c +0 -2

net/bluetooth/rfcomm/tty.c net/bluetooth/rfcomm/tty.c +1 -1

No files found.
--- a/drivers/bluetooth/Kconfig
+++ b/drivers/bluetooth/Kconfig
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -903,5 +903,3 @@ void __exit exit_btuart_cs(void)

 module_init(init_btuart_cs);
 module_exit(exit_btuart_cs);
-
-EXPORT_NO_SYMBOLS;
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -854,7 +854,7 @@ static struct tty_driver rfcomm_tty_driver = {
 #ifdef CONFIG_DEVFS_FS
 	.name			= "bluetooth/rfcomm/%d",
 #else
-	.name			= "rfcomm%d",
+	.name			= "rfcomm",
 #endif
 	.major			= RFCOMM_TTY_MAJOR,
 	.minor_start		= RFCOMM_TTY_MINOR,