USB bluetooth tty driver

renamed the bluetooth.c file to bluettty.c to help prevent user confusion
between this driver and the bluez bluetooth stack in the kernel.

4 files changed, 14 insertions, 8 deletions

diff --git a/drivers/usb/class/Config.help b/drivers/usb/class/Config.help
index f1bdb77805d1..c963c4748b41 100644
--- a/drivers/usb/class/Config.help
+++ b/drivers/usb/class/Config.help
@@ -17,15 +17,21 @@ CONFIG_USB_AUDIO
   The module will be called audio.o. If you want to compile it as a
   module, say M here and read <file:Documentation/modules.txt>.
 
-CONFIG_USB_BLUETOOTH
+CONFIG_USB_BLUETOOTH_TTY
   Say Y here if you want to connect a USB Bluetooth device to your
   computer's USB port. You will need the Bluetooth stack (available
   at <http://developer.axis.com/software/index.shtml>) to fully use
   the device.
 
+  This driver implements a tty inteface to a Bluetooth device.  If
+  you want to use a socket based Bluetooth stack (like the BlueZ
+  stack), do not use this driver.
+
+  If in doubt, say N here.
+
   This code is also available as a module ( = code which can be
   inserted in and removed from the running kernel whenever you want).
-  The module will be called bluetooth.o. If you want to compile it as
+  The module will be called bluetty.o. If you want to compile it as
   a module, say M here and read <file:Documentation/modules.txt>.
 
 CONFIG_USB_PRINTER
diff --git a/drivers/usb/class/Config.in b/drivers/usb/class/Config.in
index 94fedd1f9c30..17c2e4fbd18b 100644
--- a/drivers/usb/class/Config.in
+++ b/drivers/usb/class/Config.in
@@ -3,14 +3,14 @@
 #
 comment 'USB Device Class drivers'
 dep_tristate '  USB Audio support' CONFIG_USB_AUDIO $CONFIG_USB $CONFIG_SOUND
-dep_tristate '  USB Bluetooth support (EXPERIMENTAL)' CONFIG_USB_BLUETOOTH $CONFIG_USB $CONFIG_EXPERIMENTAL
+dep_tristate '  USB Bluetooth TTY support' CONFIG_USB_BLUETOOTH_TTY $CONFIG_USB
 dep_tristate '  USB Modem (CDC ACM) support' CONFIG_USB_ACM $CONFIG_USB
 dep_tristate '  USB Printer support' CONFIG_USB_PRINTER $CONFIG_USB
 
 
 # Turn on CONFIG_USB_CLASS if any of the drivers are compiled into the kernel
 # to make our Makefile logic a bit simpler.
-if [ "$CONFIG_USB_AUDIO" = "y" -o "$CONFIG_USB_BLUETOOTH" = "y" ]; then
+if [ "$CONFIG_USB_AUDIO" = "y" -o "$CONFIG_USB_BLUETOOTH_TTY" = "y" ]; then
    define_bool CONFIG_USB_CLASS y
 fi
 if [ "$CONFIG_USB_ACM" = "y" -o "$CONFIG_USB_PRINTER" = "y" ]; then
diff --git a/drivers/usb/class/Makefile b/drivers/usb/class/Makefile
index 53443b76f9ef..c366f5f51ae3 100644
--- a/drivers/usb/class/Makefile
+++ b/drivers/usb/class/Makefile
@@ -7,7 +7,7 @@ O_TARGET	:= usb-class.o
 
 obj-$(CONFIG_USB_ACM)		+= cdc-acm.o
 obj-$(CONFIG_USB_AUDIO)		+= audio.o
-obj-$(CONFIG_USB_BLUETOOTH)	+= bluetooth.o
+obj-$(CONFIG_USB_BLUETOOTH_TTY)	+= bluetty.o
 obj-$(CONFIG_USB_PRINTER)	+= printer.o
 
 
diff --git a/drivers/usb/class/bluetooth.c b/drivers/usb/class/bluetty.c
index 4f67676d7c82..cbe2b782a25d 100644
--- a/drivers/usb/class/bluetooth.c
+++ b/drivers/usb/class/bluetty.c
@@ -1,10 +1,10 @@
 /*
- * bluetooth.c   Version 0.13
+ * bluetty.c   Version 0.13
  *
  * Copyright (c) 2000, 2001 Greg Kroah-Hartman	<greg@kroah.com>
  * Copyright (c) 2000 Mark Douglas Corner	<mcorner@umich.edu>
  *
- * USB Bluetooth driver, based on the Bluetooth Spec version 1.0B
+ * USB Bluetooth TTY driver, based on the Bluetooth Spec version 1.0B
  * 
  * (2001/11/30) Version 0.13 gkh
  *	- added locking patch from Masoodur Rahman <rmasoodu@in.ibm.com>
@@ -237,7 +237,7 @@ static struct usb_device_id usb_bluetooth_ids [] = {
 MODULE_DEVICE_TABLE (usb, usb_bluetooth_ids);
 
 static struct usb_driver usb_bluetooth_driver = {
-	name:		"bluetooth",
+	name:		"bluetty",
 	probe:		usb_bluetooth_probe,
 	disconnect:	usb_bluetooth_disconnect,
 	id_table:	usb_bluetooth_ids,