diff options
| author | peter <peter@FreeBSD.org> | 1996-05-04 08:44:42 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1996-05-04 08:44:42 +0000 |
| commit | c0472a5f7750b52c6f3ad5601df1d3ffb9649e28 (patch) | |
| tree | 090d3d507e608b064f1671b17b93b7d83d3f7606 /sys/i386/isa/stallion.c | |
| parent | f7d96b0e47942139dd6d09b49c26676a5475bc59 (diff) | |
| download | FreeBSD-src-c0472a5f7750b52c6f3ad5601df1d3ffb9649e28.zip FreeBSD-src-c0472a5f7750b52c6f3ad5601df1d3ffb9649e28.tar.gz | |
Add $Id$
Compile for FreeBSD-2.2 (it compiles for 2.0.5, 2.1 and 2.2)
Use -current include file locations
Use -current pciintr calling conventions
Diffstat (limited to 'sys/i386/isa/stallion.c')
| -rw-r--r-- | sys/i386/isa/stallion.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c index 3f3563e..bedd0c3 100644 --- a/sys/i386/isa/stallion.c +++ b/sys/i386/isa/stallion.c @@ -32,6 +32,8 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $Id$ */ /*****************************************************************************/ @@ -53,10 +55,10 @@ #include <machine/cpu.h> #include <machine/clock.h> #include <i386/isa/isa_device.h> -#include <i386/isa/comstats.h> #include <i386/isa/ic/scd1400.h> +#include <machine/comstats.h> -#include <pci.h> +#include "pci.h" #if NPCI > 0 #include <pci/pcivar.h> #include <pci/pcireg.h> @@ -69,7 +71,7 @@ * appropriate bits of code. By default this will compile for a 2.1 * level kernel. */ -#define VFREEBSD 210 +#define VFREEBSD 220 #if VFREEBSD >= 220 #define STATIC static @@ -494,7 +496,7 @@ static stlport_t *stl_getport(int brdnr, int panelnr, int portnr); #if NPCI > 0 static char *stlpciprobe(pcici_t tag, pcidi_t type); static void stlpciattach(pcici_t tag, int unit); -static int stlpciintr(void * arg); +static void stlpciintr(void * arg); #endif /*****************************************************************************/ @@ -1894,10 +1896,9 @@ void stlintr(int unit) #if NPCI > 0 -static int stlpciintr(void *arg) +static void stlpciintr(void *arg) { stlintr(0); - return(1); } #endif |
