CVS: The file 'linux/include/linux/bluetooth/btconfig.h' has been modified.

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

The following file was modified in linux/include/linux/bluetooth:

Name            Old version     New version     Comment
----            -----------     -----------     -------
btconfig.h      1.20            1.21=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Renamed CONFIG_BLUETOOTH_USEINBUFFER to CONFIG_BLUETOOTH_USE_INBUFFER,
CONFIG_BLUETOOTH_L2CAP_USETIMERS to CONFIG_BLUETOOTH_L2CAP_USE_TIMERS, and
CONFIG_BLUETOOTH_ERICSSON_P9A to CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
(inverted meaning).


The diff of the modified file(s):

--- btconfig.h	2001/03/05 15:13:14	1.20
+++ btconfig.h	2001/03/05 15:40:30	1.21
@@ -57,7 +57,7 @@
 #define CONFIG_BLUETOOTH_PROC
=20
 /* Used to decrease overruns on serial port (see bluetooth.c) */
-#undef CONFIG_BLUETOOTH_USEINBUFFER
+#undef CONFIG_BLUETOOTH_USE_INBUFFER
=20
 #ifdef __CRIS__
 #define USE_SECURITY_MANAGER
@@ -69,12 +69,12 @@
    limitations in HW */
=20
 /* This sets current HW */
-#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
 #undef CONFIG_BLUETOOTH_NOINIT=20=20=20=20=20
+#undef CONFIG_BLUETOOTH_CSR=20=20=20=20=20=20=20=20
 #undef CONFIG_BLUETOOTH_DIGIANSWER=20
-#undef CONFIG_BLUETOOTH_USBMODULE  /* Not implemented */
-#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
 #define CONFIG_BLUETOOTH_ERICSSON
+#undef CONFIG_BLUETOOTH_GENERIC=20=20=20=20
+#undef CONFIG_BLUETOOTH_USBMODULE  /* Not implemented */
=20
 /***************
  *     HCI     *
@@ -89,8 +89,9 @@
=20
 //#define HCI_EMULATION
=20
-/* This should be defined if you are using the Ericsson P9A firmware */
-#define CONFIG_BLUETOOTH_ERICSSON_P9A
+/* This should be defined if you are using Ericsson firmware that is
+   older than P9A */
+#undef CONFIG_BLUETOOTH_SET_BAUDRATE_BLOCKING
=20
 /* This define is used during test of the host flow control */
 //#define HOST_FLOW_CTRL
@@ -107,17 +108,14 @@
  *     L2CAP    *
  ****************/
=20
-#define CONFIG_BLUETOOTH_L2CAP_USETIMERS
+#define CONFIG_BLUETOOTH_L2CAP_USE_TIMERS
 #undef CONFIG_BLUETOOTH_L2CAP_CONNECTIONLESS
=20
 /*****************
  *     RFCOMM    *
  *****************/
=20
-
-
 /***************
  *     SDP     *
  ***************/
-
 #endif /* CONFIG_BLUETOOTH */