24 files changed, 48 insertions, 51 deletions
diff --git a/sys/dev/ic/acx.c b/sys/dev/ic/acx.c
index 00743be42db..a21341dba78 100644
--- a/sys/dev/ic/acx.c
+++ b/sys/dev/ic/acx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: acx.c,v 1.107 2014/09/14 14:17:24 jsg Exp $ */
+/*	$OpenBSD: acx.c,v 1.108 2014/12/19 22:44:58 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
@@ -98,9 +98,9 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/ar5008.c b/sys/dev/ic/ar5008.c
index f52ae5c88cc..1dff6d5a722 100644
--- a/sys/dev/ic/ar5008.c
+++ b/sys/dev/ic/ar5008.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5008.c,v 1.26 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar5008.c,v 1.27 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar5416.c b/sys/dev/ic/ar5416.c
index b2a0ca4b9a9..c252fcdbb6f 100644
--- a/sys/dev/ic/ar5416.c
+++ b/sys/dev/ic/ar5416.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5416.c,v 1.14 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar5416.c,v 1.15 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,9 +35,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar5xxx.h b/sys/dev/ic/ar5xxx.h
index 359107a526b..f602fcf9b26 100644
--- a/sys/dev/ic/ar5xxx.h
+++ b/sys/dev/ic/ar5xxx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar5xxx.h,v 1.51 2013/11/21 16:16:08 mpi Exp $	*/
+/*	$OpenBSD: ar5xxx.h,v 1.52 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2004, 2005, 2006, 2007 Reyk Floeter <reyk@openbsd.org>
@@ -40,8 +40,8 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/errno.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/ar9003.c b/sys/dev/ic/ar9003.c
index ac50ecb5ba2..4f4195fb4d8 100644
--- a/sys/dev/ic/ar9003.c
+++ b/sys/dev/ic/ar9003.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9003.c,v 1.30 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9003.c,v 1.31 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9280.c b/sys/dev/ic/ar9280.c
index 297eb665eff..b359a38a77a 100644
--- a/sys/dev/ic/ar9280.c
+++ b/sys/dev/ic/ar9280.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9280.c,v 1.20 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9280.c,v 1.21 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,9 +35,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9285.c b/sys/dev/ic/ar9285.c
index 4c738b11197..e4774e17fd2 100644
--- a/sys/dev/ic/ar9285.c
+++ b/sys/dev/ic/ar9285.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9285.c,v 1.21 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9285.c,v 1.22 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9287.c b/sys/dev/ic/ar9287.c
index 3b05e0c281f..7c8f1be2e3e 100644
--- a/sys/dev/ic/ar9287.c
+++ b/sys/dev/ic/ar9287.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9287.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9287.c,v 1.20 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -35,9 +35,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/ar9380.c b/sys/dev/ic/ar9380.c
index 092de1a1622..1eea58054bf 100644
--- a/sys/dev/ic/ar9380.c
+++ b/sys/dev/ic/ar9380.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ar9380.c,v 1.19 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: ar9380.c,v 1.20 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2011 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,9 +34,9 @@
 #include <sys/queue.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 
 #if NBPFILTER > 0
 #include <net/bpf.h>
diff --git a/sys/dev/ic/arcofi.c b/sys/dev/ic/arcofi.c
index 88ef3b920d8..d99ceb3f122 100644
--- a/sys/dev/ic/arcofi.c
+++ b/sys/dev/ic/arcofi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: arcofi.c,v 1.10 2014/08/20 07:19:42 ratchov Exp $	*/
+/*	$OpenBSD: arcofi.c,v 1.11 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2011 Miodrag Vallat.
@@ -34,6 +34,7 @@
 #include <sys/device.h>
 #include <sys/kernel.h>
 #include <sys/proc.h>
+#include <sys/endian.h>
 
 #include <sys/audioio.h>
 #include <dev/audio_if.h>
@@ -42,7 +43,6 @@
 
 #include <machine/autoconf.h>
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <dev/ic/arcofivar.h>
diff --git a/sys/dev/ic/ath.c b/sys/dev/ic/ath.c
index 202a4eb4324..549560644b1 100644
--- a/sys/dev/ic/ath.c
+++ b/sys/dev/ic/ath.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: ath.c,v 1.101 2014/07/12 18:48:17 tedu Exp $  */
+/*      $OpenBSD: ath.c,v 1.102 2014/12/19 22:44:58 guenther Exp $  */
 /*	$NetBSD: ath.c,v 1.37 2004/08/18 21:59:39 dyoung Exp $	*/
 
 /*-
@@ -55,8 +55,8 @@
 #include <sys/errno.h>
 #include <sys/timeout.h>
 #include <sys/gpio.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <net/if.h>
@@ -2134,7 +2134,7 @@ ath_tx_start(struct ath_softc *sc, struct ieee80211_node *ni,
 		 * NB: Preserve byte order of IV for packet
 		 *     sniffers; it doesn't matter otherwise.
 		 */
-#if _BYTE_ORDER == _BIG_ENDIAN
+#if BYTE_ORDER == BIG_ENDIAN
 		ivp[0] = iv >> 0;
 		ivp[1] = iv >> 8;
 		ivp[2] = iv >> 16;
diff --git a/sys/dev/ic/athn.c b/sys/dev/ic/athn.c
index 4ea035b874a..cf14573557b 100644
--- a/sys/dev/ic/athn.c
+++ b/sys/dev/ic/athn.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: athn.c,v 1.83 2014/07/22 13:12:11 mpi Exp $	*/
+/*	$OpenBSD: athn.c,v 1.84 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2009 Damien Bergamini <damien.bergamini@free.fr>
@@ -36,9 +36,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/stdint.h>	/* uintptr_t */
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/atw.c b/sys/dev/ic/atw.c
index 64a8e3637e2..8961e957b44 100644
--- a/sys/dev/ic/atw.c
+++ b/sys/dev/ic/atw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: atw.c,v 1.83 2014/07/12 18:48:17 tedu Exp $	*/
+/*	$OpenBSD: atw.c,v 1.84 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: atw.c,v 1.69 2004/07/23 07:07:55 dyoung Exp $	*/
 
 /*-
@@ -46,8 +46,7 @@
 #include <sys/errno.h>
 #include <sys/device.h>
 #include <sys/time.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/bwi.c b/sys/dev/ic/bwi.c
index 30c62383d1f..7ef625f0dc1 100644
--- a/sys/dev/ic/bwi.c
+++ b/sys/dev/ic/bwi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bwi.c,v 1.111 2014/12/16 18:03:17 miod Exp $	*/
+/*	$OpenBSD: bwi.c,v 1.112 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*
  * Copyright (c) 2007 The DragonFly Project.  All rights reserved.
@@ -48,9 +48,9 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/dpt.c b/sys/dev/ic/dpt.c
index feaddcf2494..983f630241d 100644
--- a/sys/dev/ic/dpt.c
+++ b/sys/dev/ic/dpt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dpt.c,v 1.34 2013/05/30 16:15:02 deraadt Exp $	*/
+/*	$OpenBSD: dpt.c,v 1.35 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: dpt.c,v 1.12 1999/10/23 16:26:33 ad Exp $	*/
 
 /*-
@@ -69,8 +69,8 @@
 #include <sys/queue.h>
 #include <sys/proc.h>
 #include <sys/buf.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <scsi/scsi_all.h>
diff --git a/sys/dev/ic/gem.c b/sys/dev/ic/gem.c
index 0394b78b55b..50aa4777f31 100644
--- a/sys/dev/ic/gem.c
+++ b/sys/dev/ic/gem.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gem.c,v 1.106 2014/08/27 05:54:15 dlg Exp $	*/
+/*	$OpenBSD: gem.c,v 1.107 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: gem.c,v 1.1 2001/09/16 00:11:43 eeh Exp $ */
 
 /*
@@ -47,8 +47,7 @@
 #include <sys/ioctl.h>
 #include <sys/errno.h>
 #include <sys/device.h>
-
-#include <machine/endian.h>
+#include <sys/endian.h>
 
 #include <net/if.h>
 #include <net/if_dl.h>
diff --git a/sys/dev/ic/malo.c b/sys/dev/ic/malo.c
index 19397c65bb1..8278bcf0aef 100644
--- a/sys/dev/ic/malo.c
+++ b/sys/dev/ic/malo.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: malo.c,v 1.102 2014/09/14 14:17:24 jsg Exp $ */
+/*	$OpenBSD: malo.c,v 1.103 2014/12/19 22:44:58 guenther Exp $ */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -29,9 +29,9 @@
 #include <sys/socket.h>
 #include <sys/sockio.h>
 #include <sys/systm.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/pgt.c b/sys/dev/ic/pgt.c
index 5e707288d64..934d9355fa9 100644
--- a/sys/dev/ic/pgt.c
+++ b/sys/dev/ic/pgt.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pgt.c,v 1.75 2014/07/22 13:12:12 mpi Exp $  */
+/*	$OpenBSD: pgt.c,v 1.76 2014/12/19 22:44:58 guenther Exp $  */
 
 /*
  * Copyright (c) 2006 Claudio Jeker <claudio@openbsd.org>
@@ -60,7 +60,6 @@
 #include <sys/device.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #include <net/if.h>
diff --git a/sys/dev/ic/rt2560.c b/sys/dev/ic/rt2560.c
index fc67dc93192..5a40c6158d3 100644
--- a/sys/dev/ic/rt2560.c
+++ b/sys/dev/ic/rt2560.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2560.c,v 1.67 2014/09/06 05:41:35 jsg Exp $  */
+/*	$OpenBSD: rt2560.c,v 1.68 2014/12/19 22:44:58 guenther Exp $  */
 
 /*-
  * Copyright (c) 2005, 2006
@@ -34,9 +34,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rt2661.c b/sys/dev/ic/rt2661.c
index 72ecd5b477d..61f3a4b2db6 100644
--- a/sys/dev/ic/rt2661.c
+++ b/sys/dev/ic/rt2661.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2661.c,v 1.76 2014/09/06 05:41:35 jsg Exp $	*/
+/*	$OpenBSD: rt2661.c,v 1.77 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2006
@@ -35,9 +35,9 @@
 #include <sys/conf.h>
 #include <sys/device.h>
 #include <sys/queue.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 52fa1167557..75859db260c 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rt2860.c,v 1.76 2014/11/18 02:37:30 tedu Exp $	*/
+/*	$OpenBSD: rt2860.c,v 1.77 2014/12/19 22:44:58 guenther Exp $	*/
 
 /*-
  * Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -34,9 +34,9 @@
 #include <sys/timeout.h>
 #include <sys/conf.h>
 #include <sys/device.h>
+#include <sys/endian.h>
 
 #include <machine/bus.h>
-#include <machine/endian.h>
 #include <machine/intr.h>
 
 #if NBPFILTER > 0
diff --git a/sys/dev/ic/rtw.c b/sys/dev/ic/rtw.c
index 7bb81932970..1897e5a5e12 100644
--- a/sys/dev/ic/rtw.c
+++ b/sys/dev/ic/rtw.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rtw.c,v 1.87 2014/07/13 23:10:23 deraadt Exp $	*/
+/*	$OpenBSD: rtw.c,v 1.88 2014/12/19 22:44:58 guenther Exp $	*/
 /*	$NetBSD: rtw.c,v 1.29 2004/12/27 19:49:16 dyoung Exp $ */
 
 /*-
@@ -46,8 +46,8 @@
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 #include <machine/intr.h>	/* splnet */
 
diff --git a/sys/dev/ic/siop.c b/sys/dev/ic/siop.c
index dcb6ab77c9e..9dade4b89cb 100644
--- a/sys/dev/ic/siop.c
+++ b/sys/dev/ic/siop.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop.c,v 1.68 2014/07/13 23:10:23 deraadt Exp $ */
+/*	$OpenBSD: siop.c,v 1.69 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: siop.c,v 1.79 2005/11/18 23:10:32 bouyer Exp $	*/
 
 /*
@@ -34,8 +34,8 @@
 #include <sys/malloc.h>
 #include <sys/buf.h>
 #include <sys/kernel.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <dev/microcode/siop/siop.out>
diff --git a/sys/dev/ic/siop_common.c b/sys/dev/ic/siop_common.c
index e6b47b0a4f7..2b0e56fef5c 100644
--- a/sys/dev/ic/siop_common.c
+++ b/sys/dev/ic/siop_common.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siop_common.c,v 1.35 2012/02/24 06:19:00 guenther Exp $ */
+/*	$OpenBSD: siop_common.c,v 1.36 2014/12/19 22:44:58 guenther Exp $ */
 /*	$NetBSD: siop_common.c,v 1.37 2005/02/27 00:27:02 perry Exp $	*/
 
 /*
@@ -35,8 +35,8 @@
 #include <sys/buf.h>
 #include <sys/kernel.h>
 #include <sys/scsiio.h>
+#include <sys/endian.h>
 
-#include <machine/endian.h>
 #include <machine/bus.h>
 
 #include <scsi/scsi_all.h>