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

From: Luis R. Rodriguez
Date: Mon May 24 2004 - 04:11:02 EST



2004-05-01 Margit Schubert-While <margitsw@xxxxxxxxxxx>

* Fix 2.4 SMP build

--
GnuPG Key fingerprint = 113F B290 C6D2 0251 4D84 A34A 6ADD 4937 E20A 525E
2004-05-01 Margit Schubert-While <margitsw@xxxxxxxxxxx>

* Fix 2.4 SMP build

Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c
===================================================================
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 10:09:58 -0000 1.77
+++ linux-2.6.7-rc1/drivers/net/wireless/prism54/islpci_dev.c 27 Apr 2004 17: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 10:09:58 msw Exp $
+/* $Header: /var/lib/cvs/prism54-ng/ksrc/islpci_dev.c,v 1.78 2004/04/27 17:22:35 ajfa Exp $
*
* Copyright (C) 2002 Intersil Americas Inc.
* Copyright (C) 2003 Herbert Valerio Riedel <hvr@xxxxxxx>
@@ -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;
}

Index: linux-2.6.7-rc1/drivers/net/wireless/prism54/prismcompat24.h
===================================================================
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 2004 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>

#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,25)
#define module_param(x, y, z) MODULE_PARM(x, "i")

Attachment: pgp00000.pgp
Description: PGP signature