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

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

drivers/bluetooth/Kconfig

@@ -100,7 +100,7 @@ config BT_HCIBLUECARD
 	help
 	  Bluetooth HCI BlueCard (PC Card) driver.
 	  This driver provides support for Bluetooth PCMCIA devices with
-	     Anycom BlueCard interface:
+	  Anycom BlueCard interface:
 	     Anycom Bluetooth PC Card
 	     Anycom Bluetooth CF Card
 
@@ -114,11 +114,11 @@ config BT_HCIBTUART
 	  Bluetooth HCI UART (PC Card) driver.
 	  This driver provides support for Bluetooth PCMCIA devices with
 	  an UART interface:
-	  Xircom CreditCard Bluetooth Adapter
-	  Xircom RealPort2 Bluetooth Adapter
-	  Sphinx PICO Card
-	  H-Soft blue+Card
-	  Cyber-blue Compact Flash Card
+	     Xircom CreditCard Bluetooth Adapter
+	     Xircom RealPort2 Bluetooth Adapter
+	     Sphinx PICO Card
+	     H-Soft blue+Card
+	     Cyber-blue Compact Flash Card
 
 	  Say Y here to compile support for HCI UART devices into the
 	  kernel or say M to compile it as module (btuart_cs.o).

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;

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,