Merge branches 'at91', 'cache', 'cup', 'ep93xx', 'ixp4xx', 'nuc', 'pending-dma-stream...

[mv-sheeva.git] / drivers / char / rio / cmdblk.h

diff --git a/drivers/char/rio/cmdblk.h b/drivers/char/rio/cmdblk.h
index a9a8c45631d754b5952e5a592a450d8097396698..9ed4f861675acdd3248718964a834fea38a19dea 100644 (file)
--- a/drivers/char/rio/cmdblk.h
+++ b/drivers/char/rio/cmdblk.h
@@ -33,12 +33,6 @@
 #ifndef __rio_cmdblk_h__
 #define __rio_cmdblk_h__
 
-#ifdef SCCS_LABELS
-#ifndef lint
-static char *_cmdblk_h_sccs_ = "@(#)cmdblk.h   1.2";
-#endif
-#endif
-
 /*
 ** the structure of a command block, used to queue commands destined for
 ** a rup.
@@ -48,10 +42,10 @@ struct CmdBlk {
        struct CmdBlk *NextP;   /* Pointer to next command block */
        struct PKT Packet;      /* A packet, to copy to the rup */
        /* The func to call to check if OK */
-       int (*PreFuncP) (int, struct CmdBlk *);
+       int (*PreFuncP) (unsigned long, struct CmdBlk *);
        int PreArg;             /* The arg for the func */
        /* The func to call when completed */
-       int (*PostFuncP) (int, struct CmdBlk *);
+       int (*PostFuncP) (unsigned long, struct CmdBlk *);
        int PostArg;            /* The arg for the func */
 };