CVS: 2 files have been modified in linux/drivers/char/bluetooth.

[Peter K. <pk...@us...>]

The following files were modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
bluetooth.c     1.167           1.168=20=20=20=20=20=20=20=20=20=20=20
hci_vendor.c    1.24            1.25=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Removed bt_show_vendor().


The diff of the modified file(s):

--- bluetooth.c	2001/04/18 00:53:37	1.167
+++ bluetooth.c	2001/04/18 14:45:21	1.168
@@ -2255,7 +2255,8 @@
=20=09
 	DSYS("Initialising Bluetooth Stack\n");
=20
-	bt_show_vendor();
+	DSYS("Current HW: %s\n", bt_hw_vendor());
+
 	hci_init();
 	l2cap_init();
=20
--- hci_vendor.c	2001/04/17 21:55:56	1.24
+++ hci_vendor.c	2001/04/18 14:45:21	1.25
@@ -494,20 +494,22 @@
 char*
 bt_hw_vendor(void)
 {
-	return "Unknown hardware";
+#if defined(CONFIG_BLUETOOTH_USB)
+	return "USB";
+#elif defined(CONFIG_BLUETOOTH_GENERIC)
+	return "Generic";
+#else
+	return "Unknown";
+#endif
 }
 #endif
=20
+/*************************************************************************=
****/
+
 char*
 bt_hw_firmware(void)
 {
 	return bt_hw_firmware_info;
-}
-
-void
-bt_show_vendor(void)
-{
-	DSYS("Current HW: %s\n", VENDOR);
 }
=20
 /********************* END OF FILE hci_vendor.c **************************=
****/