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.22            1.23=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Moved configuration options that cannot be set using the kernel
configurator to be outside the check for CONFIG_BLUETOOTH.


The diff of the modified file(s):

--- btconfig.h	2001/03/05 15:53:03	1.22
+++ btconfig.h	2001/03/05 16:33:36	1.23
@@ -80,30 +80,10 @@
  *     HCI     *
  ***************/
=20
-/*=20
-   HCI emulation enables using the stack without any bluetooth hardware.=
=20
-   With this option defined you can test the stack by connecting two Linux=
=20
-   machines with a nullmodem cabel. (If you are defining this you must sta=
rt=20
-   btd with no hw init)=20
-*/
-
-//#define HCI_EMULATION
-
 /* 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
-
-#ifdef __KERNEL__
-/* Don't define these four, they are only used for AXIS internal tests */
-//#define EMC_TEST
-//#define EMC_TEST_INITIATOR
-//#define EMC_LISTNER_ADDR 0x1810ce
-//#define EMC_TEST_DATA_SIZE 678
-#endif
-
 /****************
  *     L2CAP    *
  ****************/
@@ -119,3 +99,26 @@
  *     SDP     *
  ***************/
 #endif /* CONFIG_BLUETOOTH */
+
+/*************************************************************************=
**/
+
+/* The following configurations cannot be set using the kernel
+   configuration tools */
+
+/* HCI emulation enables using the stack without any bluetooth hardware.=
=20
+   With this option defined you can test the stack by connecting two Linux=
=20
+   machines with a nullmodem cabel. (If you are defining this you must sta=
rt=20
+   btd with no hw init) */
+
+//#define HCI_EMULATION
+
+/* This define is used during test of the host flow control */
+//#define HOST_FLOW_CTRL
+
+#ifdef __KERNEL__
+/* Don't define these four, they are only used for AXIS internal tests */
+//#define EMC_TEST
+//#define EMC_TEST_INITIATOR
+//#define EMC_LISTNER_ADDR 0x1810ce
+//#define EMC_TEST_DATA_SIZE 678
+#endif