diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-02 07:33:44 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-05-02 07:33:44 +0000 |
| commit | f14a97c7ca3c8a9b8689180fe19a6f60b8acb141 (patch) | |
| tree | ff1ebe3c3215915e06c368a63a797a35baea9b0c /sys/arch | |
| parent | 798e2d980026cc2eea0e599657138655cae4f0ea (diff) | |
Fixup of a merge error
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/amiga/include/psl.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/sys/arch/amiga/include/psl.h b/sys/arch/amiga/include/psl.h index 130934c5a93..708b63887e8 100644 --- a/sys/arch/amiga/include/psl.h +++ b/sys/arch/amiga/include/psl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: psl.h,v 1.4 1996/05/02 06:44:46 niklas Exp $ */ +/* $OpenBSD: psl.h,v 1.5 1996/05/02 07:33:43 niklas Exp $ */ /* $NetBSD: psl.h,v 1.8 1996/04/21 21:13:22 veego Exp $ */ #ifndef _MACHINE_PSL_H_ @@ -8,13 +8,6 @@ #if defined(_KERNEL) && !defined(_LOCORE) -/* - * spl functions; all are normally done in-line - */ -#include <machine/psl.h> - -#ifdef _KERNEL - static __inline int splraise(npsl) register int npsl; |