[Prism54-devel] [PATCH 13/14 linux-2.6.7-rc1] prism54: Fix 2.4 SMP build

[Luis R. Rodriguez]

--UQUSR6hGnEXrhNQw
Content-Type: multipart/mixed; boundary="K4/DQSt3oreaYeED"
Content-Disposition: inline


--K4/DQSt3oreaYeED
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable


2004-05-01      Margit Schubert-While <margitsw@t-online.de>

        * Fix 2.4 SMP build

--=20
GnuPG Key fingerprint =3D 113F B290 C6D2 0251 4D84  A34A 6ADD 4937 E20A 525E

--K4/DQSt3oreaYeED
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="13-fix-smp-build.patch"
Content-Transfer-Encoding: quoted-printable

2004-05-01	Margit Schubert-While <margitsw@t-online.de>

	* Fix 2.4 SMP build

Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -r1.77 -r1.78
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c	26 Apr 2004 1=
0:09:58 -0000	1.77
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c	27 Apr 2004 1=
7:22:35 -0000	1.78
@@ -1,4 +1,4 @@
-/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v 1.77 2004/04/26 1=
0:09:58 msw Exp $
+/*  $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v 1.78 2004/04/27 1=
7:22:35 ajfa Exp $
  * =20
  *  Copyright (C) 2002 Intersil Americas Inc.
  *  Copyright (C) 2003 Herbert Valerio Riedel <hvr@gnu.org>
@@ -69,7 +69,9 @@
 	if (reg & ISL38XX_CTRL_STAT_SLEEPMODE)
 		/* device is in sleep mode, IRQ was generated by someone else */
 	{
-		printk(KERN_DEBUG "Assuming someone else called the IRQ\n");
+#if VERBOSE > SHOW_ERROR_MESSAGES
+		DEBUG(SHOW_TRACING, "Assuming someone else called the IRQ\n");
+#endif
 		return IRQ_NONE;
 	}
=20
Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/lib/cvs/prism54-ng/ksrc/prismcompat24.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h	26 Apr 200=
4 10:09:58 -0000	1.5
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h	1 May 2004=
 08:40:16 -0000	1.6
@@ -28,6 +28,7 @@
 #include <linux/tqueue.h>
 #include <linux/version.h>
 #include <linux/compiler.h>
+#include <asm/uaccess.h>
=20
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,25)
 #define module_param(x, y, z)	MODULE_PARM(x, "i")

--K4/DQSt3oreaYeED--

--UQUSR6hGnEXrhNQw
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (GNU/Linux)

iD8DBQFAsbNyat1JN+IKUl4RAselAKCPdABbH7EYUaMi2xD/DtWNTfQJaACfY6Lh
j176ut7QnjCY7cXpdYAq34o=
=6M9h
-----END PGP SIGNATURE-----

--UQUSR6hGnEXrhNQw--