X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fblock%2Fxd.c;h=624d30f7da3fc0ba125de8c46b5f9ec8d1f4efc8;hb=4b4f7280d7fd1feeff134c2cf2db32fd583b6c29;hp=10cc38783bdf3c860b0f9c45e06c1714b3c2b490;hpb=44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3;p=linux-2.6

diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 10cc38783b..624d30f7da 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -48,9 +48,9 @@
 #include <linux/blkdev.h>
 #include <linux/blkpg.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 
 #include <asm/system.h>
-#include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/dma.h>
 
@@ -298,7 +298,7 @@ static u_char __init xd_detect (u_char *controller, unsigned int *address)
 }
 
 /* do_xd_request: handle an incoming request */
-static void do_xd_request (request_queue_t * q)
+static void do_xd_request (struct request_queue * q)
 {
 	struct request *req;