I never did get a reply from the paride maintainer, so here is a patch.
I know that Linus is a bit concerned about including linux/wait.h into
these files, but short of re-writing the paride header file, I see no
alternative.
The problem stems from the 'wait_queue_head_t' element to a structure
used in paride.h, which is included in all the patched files. This
element is not actually used by the following files, only by paride.c.
The following patch fixes this by including linux/wait.h.
diff -urN linux-orig/drivers/block/paride/aten.c linux/drivers/block/paride/aten.c
--- linux-orig/drivers/block/paride/aten.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/aten.c Wed Nov 24 19:29:50 1999
@@ -20,6 +20,7 @@
#include <linux/module.h>
#include <linux/delay.h>
#include <linux/kernel.h>
+#include <linux/wait.h>
#include <linux/types.h>
#include <asm/io.h>
diff -urN linux-orig/drivers/block/paride/bpck.c linux/drivers/block/paride/bpck.c
--- linux-orig/drivers/block/paride/bpck.c Thu Aug 20 23:17:05 1998
+++ linux/drivers/block/paride/bpck.c Wed May 26 11:24:13 1999
@@ -20,6 +20,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/comm.c linux/drivers/block/paride/comm.c
--- linux-orig/drivers/block/paride/comm.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/comm.c Wed May 26 11:24:13 1999
@@ -20,6 +20,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/dstr.c linux/drivers/block/paride/dstr.c
--- linux-orig/drivers/block/paride/dstr.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/dstr.c Wed May 26 11:24:13 1999
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/epat.c linux/drivers/block/paride/epat.c
--- linux-orig/drivers/block/paride/epat.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/epat.c Wed May 26 11:24:13 1999
@@ -21,6 +21,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/epia.c linux/drivers/block/paride/epia.c
--- linux-orig/drivers/block/paride/epia.c Wed Jun 24 22:27:18 1998
+++ linux/drivers/block/paride/epia.c Wed May 26 11:24:13 1999
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/fit2.c linux/drivers/block/paride/fit2.c
--- linux-orig/drivers/block/paride/fit2.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/fit2.c Wed May 26 11:24:14 1999
@@ -19,6 +19,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/fit3.c linux/drivers/block/paride/fit3.c
--- linux-orig/drivers/block/paride/fit3.c Sat Jun 13 20:08:19 1998
+++ linux/drivers/block/paride/fit3.c Wed May 26 11:24:14 1999
@@ -23,6 +23,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/friq.c linux/drivers/block/paride/friq.c
--- linux-orig/drivers/block/paride/friq.c Tue Dec 22 16:29:00 1998
+++ linux/drivers/block/paride/friq.c Wed May 26 11:24:14 1999
@@ -31,6 +31,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/frpw.c linux/drivers/block/paride/frpw.c
--- linux-orig/drivers/block/paride/frpw.c Tue Dec 22 16:29:00 1998
+++ linux/drivers/block/paride/frpw.c Wed May 26 11:24:14 1999
@@ -29,6 +29,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/kbic.c linux/drivers/block/paride/kbic.c
--- linux-orig/drivers/block/paride/kbic.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/kbic.c Wed May 26 11:24:14 1999
@@ -24,6 +24,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/ktti.c linux/drivers/block/paride/ktti.c
--- linux-orig/drivers/block/paride/ktti.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/ktti.c Wed May 26 11:24:14 1999
@@ -15,6 +15,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/on20.c linux/drivers/block/paride/on20.c
--- linux-orig/drivers/block/paride/on20.c Fri May 15 03:11:48 1998
+++ linux/drivers/block/paride/on20.c Wed May 26 11:24:14 1999
@@ -18,6 +18,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/on26.c linux/drivers/block/paride/on26.c
--- linux-orig/drivers/block/paride/on26.c Tue Dec 22 16:29:00 1998
+++ linux/drivers/block/paride/on26.c Wed May 26 11:24:14 1999
@@ -22,6 +22,7 @@
#include <linux/delay.h>
#include <linux/kernel.h>
#include <linux/types.h>
+#include <linux/wait.h>
#include <asm/io.h>
#include "paride.h"
diff -urN linux-orig/drivers/block/paride/pg.c linux/drivers/block/paride/pg.c
--- linux-orig/drivers/block/paride/pg.c Wed Oct 20 11:57:14 1999
+++ linux/drivers/block/paride/pg.c Sat Oct 16 11:16:02 1999
@@ -169,6 +169,7 @@
#include <linux/malloc.h>
#include <linux/mtio.h>
#include <linux/pg.h>
+#include <linux/wait.h>
#include <asm/uaccess.h>
diff -urN linux-orig/drivers/block/paride/pt.c linux/drivers/block/paride/pt.c
--- linux-orig/drivers/block/paride/pt.c Wed Oct 20 11:57:14 1999
+++ linux/drivers/block/paride/pt.c Sat Oct 16 11:16:03 1999
@@ -147,6 +147,7 @@
#include <linux/delay.h>
#include <linux/malloc.h>
#include <linux/mtio.h>
+#include <linux/wait.h>
#include <asm/uaccess.h>
_____
|_____| ------------------------------------------------- ---+---+-
| | Russell King rmk@arm.linux.org.uk --- ---
| | | | http://www.arm.linux.org.uk/~rmk/aboutme.html / / |
| +-+-+ --- -+-
/ | THE developer of ARM Linux |+| /|\
/ | | | --- |
+-+-+ ------------------------------------------------- /\\\ |
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.rutgers.edu
Please read the FAQ at http://www.tux.org/lkml/