[Gc-linux-cvs] linux/drivers/block/gcn-di gcn-di.c,1.20,1.21

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/drivers/block/gcn-di
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv29560/drivers/block/gcn-di

Modified Files:
	gcn-di.c 
Log Message:
Merged 2.6.23.


Index: gcn-di.c
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/gcn-di/gcn-di.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- gcn-di.c	14 Nov 2007 23:08:48 -0000	1.20
+++ gcn-di.c	16 Nov 2007 23:26:07 -0000	1.21
@@ -1867,7 +1867,7 @@
 /*
  * Processes a block layer request.
  */
-static void di_do_request(request_queue_t *q)
+static void di_do_request(struct request_queue *q)
 {
 	struct di_device *ddev = q->queuedata;
 	struct di_command *cmd = &ddev->req_cmd;