summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-03-23 17:02:34 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-03-23 17:02:34 +0000
commita9d72ffbdfc4c688e96a198139f6d77572adab4d (patch)
tree034418498c737a377579e041c3f1df1dfb2bcfed /sys
parent96b354137b8039e6c2ebd6f88c0008ecb2e4f20d (diff)
Including <sparc64/intreg.h> here is ugly, but intr.h only comes from
<machine/cpu.h> if _KERNEL is defined. The bootblocks are stupid, and for now they need this. We need more namespace cleanup, for sure.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/sparc64/include/intr.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/arch/sparc64/include/intr.h b/sys/arch/sparc64/include/intr.h
index 82cf8c6cf7a..e073252fcbf 100644
--- a/sys/arch/sparc64/include/intr.h
+++ b/sys/arch/sparc64/include/intr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intr.h,v 1.13 2011/03/23 16:54:37 pirofti Exp $ */
+/* $OpenBSD: intr.h,v 1.14 2011/03/23 17:02:33 deraadt Exp $ */
/* $NetBSD: intr.h,v 1.8 2001/01/14 23:50:30 thorpej Exp $ */
/*-
@@ -33,9 +33,7 @@
#ifndef _MACHINE_INTR_H_
#define _MACHINE_INTR_H_
-#ifndef _MACHINE_INTR_H_
#include <sparc64/sparc64/intreg.h>
-#endif
#include <sys/evcount.h>