
From: "Luis R. Rodriguez" <mcgrof@studorgs.rutgers.edu>

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

Fix 2.4 SMP build

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/drivers/net/wireless/prism54/islpci_dev.c    |    6 ++++--
 25-akpm/drivers/net/wireless/prism54/prismcompat24.h |    1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff -puN drivers/net/wireless/prism54/islpci_dev.c~prism54-fix-24-smp-build drivers/net/wireless/prism54/islpci_dev.c
--- 25/drivers/net/wireless/prism54/islpci_dev.c~prism54-fix-24-smp-build	Wed May 26 16:17:23 2004
+++ 25-akpm/drivers/net/wireless/prism54/islpci_dev.c	Wed May 26 16:17:23 2004
@@ -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@gnu.org>
@@ -69,7 +69,9 @@ islpci_interrupt(int irq, void *config, 
 	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;
 	}
 
diff -puN drivers/net/wireless/prism54/prismcompat24.h~prism54-fix-24-smp-build drivers/net/wireless/prism54/prismcompat24.h
--- 25/drivers/net/wireless/prism54/prismcompat24.h~prism54-fix-24-smp-build	Wed May 26 16:17:23 2004
+++ 25-akpm/drivers/net/wireless/prism54/prismcompat24.h	Wed May 26 16:17:23 2004
@@ -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")
_
