Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / linux / stallion.h

diff --git a/include/linux/stallion.h b/include/linux/stallion.h
index fc118c6..13a37f1 100644 (file)
--- a/include/linux/stallion.h
+++ b/include/linux/stallion.h
@@ -3,7 +3,7 @@
 /*
  *     stallion.h  -- stallion multiport serial driver.
  *
- *     Copyright (C) 1996-1998  Stallion Technologies (support@stallion.oz.au).
+ *     Copyright (C) 1996-1998  Stallion Technologies
  *     Copyright (C) 1994-1996  Greg Ungerer.
  *
  *     This program is free software; you can redistribute it and/or modify
@@ -21,8 +21,6 @@
  *     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <linux/version.h>
-
 /*****************************************************************************/
 #ifndef        _STALLION_H
 #define        _STALLION_H
@@ -126,7 +124,7 @@ typedef struct stlbrd {
        int             nrbnks;
        int             irq;
        int             irqtype;
-       void            (*isr)(struct stlbrd *brdp);
+       int             (*isr)(struct stlbrd *brdp);
        unsigned int    ioaddr1;
        unsigned int    ioaddr2;
        unsigned int    iosize1;