Merge branch 'linus' into tracing/urgent

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

diff --git a/drivers/char/rio/cmdblk.h b/drivers/char/rio/cmdblk.h
index 2b8efbdbee1c3d66be9e641e8558f6d409eed4c2..9ed4f861675acdd3248718964a834fea38a19dea 100644 (file)
--- a/drivers/char/rio/cmdblk.h
+++ b/drivers/char/rio/cmdblk.h
@@ -33,27 +33,20 @@
 #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.
 */
 
-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     PreArg;         /* The arg for the func */
-                               /* The func to call when completed */
-       int     (*PostFuncP)(int, struct CmdBlk *);
-       int     PostArg;        /* The arg for the func */
+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) (unsigned long, struct CmdBlk *);
+       int PreArg;             /* The arg for the func */
+       /* The func to call when completed */
+       int (*PostFuncP) (unsigned long, struct CmdBlk *);
+       int PostArg;            /* The arg for the func */
 };
 
 #define NUM_RIO_CMD_BLKS (3 * (MAX_RUP * 4 + LINKS_PER_UNIT * 4))