CVS: The file 'linux/drivers/char/bluetooth/hci.c' has been modified.

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

The following file was modified in linux/drivers/char/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
hci.c           1.123           1.124=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Removed a compiler warning.


The diff of the modified file(s):

--- hci.c	2001/03/05 16:42:57	1.123
+++ hci.c	2001/03/05 16:56:45	1.124
@@ -186,7 +186,9 @@
 static void send_cmd_queue(void);
 static void update_nhcp(s32 nhcp);
 static s32 send_inq_cmd_block(u8 *cmd, u8 len);
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 static u8* get_bd(u16 con_hdl);
+#endif
 static s32 get_con_hdl(u8 *bd);
=20
 /* Link Control Commands */
@@ -2679,6 +2681,7 @@
 	}
 }
=20
+#ifdef CONFIG_BLUETOOTH_USE_SECURITY_MANAGER
 u8*
 get_bd(u16 con_hdl)
 {
@@ -2697,7 +2700,7 @@
 		return hci_ctrl.con[i].bd;
 	}
 }
-
+#endif /* CONFIG_BLUETOOTH_USE_SECURITY_MANAGER */
=20
 /*
  * This function will return the value of the active bd address, i.e. the