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

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

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

Name            Old version     New version     Comment
----            -----------     -----------     -------
test.c          1.23            1.24=20=20=20=20=20=20=20=20=20=20=20=20

The accompanying log:

Made it compile for the user stack.


The diff of the modified file(s):

--- test.c	2001/08/06 10:50:18	1.23
+++ test.c	2001/08/06 11:12:32	1.24
@@ -185,8 +185,6 @@
 	return 0;
 }
=20
-static struct timer_list test_timer;
-
 static void
 test_timeout(unsigned long ptr)
 {
@@ -209,6 +207,10 @@
=20
 void test_connect_ind(l2cap_con *l2cap)=20
 {
+#ifdef __KERNEL__
+	static struct timer_list test_timer;
+#endif
+
 	D_STATE("test_connect_ind : remote cid : %d\n", l2cap->remote_cid);
 	PRINTPSM(l2cap);
=20
@@ -220,9 +222,7 @@
 		}
=20
 		/* start 5 sec timer */=09=09
-#ifndef __KERNEL__
-
-#else
+#ifdef __KERNEL__
 		init_timer(&test_timer);
 		test_timer.function =3D test_timeout;
 		test_timer.data =3D (unsigned long)l2cap;