Normalize sentinel. Use _MACHINE_*_H_ and _<ARCH>_*_H_ properly and consitently.

Discussed and okay drahn@. Okay deraadt@.

7 files changed, 27 insertions, 27 deletions

diff --git a/sys/arch/zaurus/include/_types.h b/sys/arch/zaurus/include/_types.h
index 34a18e47fd3..7d1985392fb 100644
--- a/sys/arch/zaurus/include/_types.h
+++ b/sys/arch/zaurus/include/_types.h
@@ -1,7 +1,7 @@
-/* 	$OpenBSD: _types.h,v 1.5 2009/11/04 19:14:10 kettenis Exp $	*/
+/* 	$OpenBSD: _types.h,v 1.6 2011/03/23 16:54:37 pirofti Exp $	*/
 
-#ifndef _ZAURUS__TYPES_H_
-#define	_ZAURUS__TYPES_H_
+#ifndef _MACHINE__TYPES_H_
+#define	_MACHINE__TYPES_H_
 
 #include <arm/_types.h>
 
diff --git a/sys/arch/zaurus/include/atomic.h b/sys/arch/zaurus/include/atomic.h
index 7812833a3f7..2cdf06fcd23 100644
--- a/sys/arch/zaurus/include/atomic.h
+++ b/sys/arch/zaurus/include/atomic.h
@@ -1,10 +1,10 @@
-/*	$OpenBSD: atomic.h,v 1.4 2007/02/19 17:18:43 deraadt Exp $	*/
+/*	$OpenBSD: atomic.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 
 /* Public Domain */
 
-#ifndef __ZAURUS_ATOMIC_H__
-#define __ZAURUS_ATOMIC_H__
+#ifndef _MACHINE_ATOMIC_H_
+#define _MACHINE_ATOMIC_H_
 
 #include <arm/atomic.h>
 
-#endif /* __ZAURUS_ATOMIC_H__ */
+#endif /* _MACHINE_ATOMIC_H_ */
diff --git a/sys/arch/zaurus/include/conf.h b/sys/arch/zaurus/include/conf.h
index 7049fcaac10..87b4a7dda5d 100644
--- a/sys/arch/zaurus/include/conf.h
+++ b/sys/arch/zaurus/include/conf.h
@@ -1,8 +1,8 @@
-/*	$OpenBSD: conf.h,v 1.7 2010/11/28 20:49:47 miod Exp $	*/
+/*	$OpenBSD: conf.h,v 1.8 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: conf.h,v 1.8 2002/02/10 12:26:03 chris Exp $	*/
 
-#ifndef _ZAURUS_CONF_H
-#define	_ZAURUS_CONF_H
+#ifndef _MACHINE_CONF_H_
+#define	_MACHINE_CONF_H_
 
 #include <sys/conf.h>
 
@@ -14,4 +14,4 @@
 
 #include <arm/conf.h>
 
-#endif	/* _ZAURUS_CONF_H */
+#endif	/* _MACHINE_CONF_H_ */
diff --git a/sys/arch/zaurus/include/intr.h b/sys/arch/zaurus/include/intr.h
index b1e0feb0442..a2c69799f6d 100644
--- a/sys/arch/zaurus/include/intr.h
+++ b/sys/arch/zaurus/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.9 2010/04/23 03:50:22 miod Exp $	*/
+/*	$OpenBSD: intr.h,v 1.10 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: intr.h,v 1.12 2003/06/16 20:00:59 thorpej Exp $	*/
 
 /*
@@ -36,8 +36,8 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef	_EVBARM_INTR_H_
-#define	_EVBARM_INTR_H_
+#ifndef	_MACHINE_INTR_H_
+#define	_MACHINE_INTR_H_
 
 #ifdef _KERNEL
 
@@ -101,5 +101,5 @@
 
 #endif /* _KERNEL */
 
-#endif	/* _EVBARM_INTR_H_ */
+#endif	/* _MACHINE_INTR_H_ */
 
diff --git a/sys/arch/zaurus/include/param.h b/sys/arch/zaurus/include/param.h
index 1b8a3abffcd..11fba7cfedd 100644
--- a/sys/arch/zaurus/include/param.h
+++ b/sys/arch/zaurus/include/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.4 2004/12/31 14:58:53 drahn Exp $	*/
+/*	$OpenBSD: param.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: param.h,v 1.4 2002/02/12 06:58:19 thorpej Exp $	*/
 
 /*
@@ -33,8 +33,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ZAURUS_PARAM_H_
-#define	_ZAURUS_PARAM_H_
+#ifndef	_MACHINE_PARAM_H_
+#define	_MACHINE_PARAM_H_
 
 /*
  * 1 page should be enough
@@ -48,4 +48,4 @@
 #define	_MACHINE	zaurus
 #define	MACHINE		"zaurus"
 
-#endif	/* _ZAURUS_PARAM_H_ */
+#endif	/* _MACHINE_PARAM_H_ */
diff --git a/sys/arch/zaurus/include/spinlock.h b/sys/arch/zaurus/include/spinlock.h
index 7d443100474..76c99ed16d7 100644
--- a/sys/arch/zaurus/include/spinlock.h
+++ b/sys/arch/zaurus/include/spinlock.h
@@ -1,7 +1,7 @@
 
-/*	$OpenBSD: spinlock.h,v 1.3 2005/12/01 22:09:59 deraadt Exp $	*/
-#ifndef _ZAURUS_SPINLOCK_H_
-#define _ZAURUS_SPINLOCK_H_
+/*	$OpenBSD: spinlock.h,v 1.4 2011/03/23 16:54:37 pirofti Exp $	*/
+#ifndef _MACHINE_SPINLOCK_H_
+#define _MACHINE_SPINLOCK_H_
 #include <arm/spinlock.h>
-#endif /* _ZAURUS_SPINLOCK_H_ */
+#endif /* _MACHINE_SPINLOCK_H_ */
 
diff --git a/sys/arch/zaurus/include/vmparam.h b/sys/arch/zaurus/include/vmparam.h
index ef976fed4de..137c992070c 100644
--- a/sys/arch/zaurus/include/vmparam.h
+++ b/sys/arch/zaurus/include/vmparam.h
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: vmparam.h,v 1.4 2006/06/04 17:21:24 miod Exp $	*/
+/* 	$OpenBSD: vmparam.h,v 1.5 2011/03/23 16:54:37 pirofti Exp $	*/
 /*	$NetBSD: vmparam.h,v 1.23 2003/05/22 05:47:07 thorpej Exp $	*/
 
 /*
@@ -30,8 +30,8 @@
  * SUCH DAMAGE.
  */
 
-#ifndef	_ARM32_VMPARAM_H_
-#define	_ARM32_VMPARAM_H_
+#ifndef	_MACHINE_VMPARAM_H_
+#define	_MACHINE_VMPARAM_H_
 
 #define	ARM_KERNEL_BASE		0xc0000000
 
@@ -83,4 +83,4 @@
 #define	VM_FREELIST_DEFAULT	0
 
 
-#endif	/* _ARM32_VMPARAM_H_ */
+#endif	/* _MACHINE_VMPARAM_H_ */