summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ic/if_wi.c4
-rw-r--r--sys/dev/ic/if_wi_hostap.c4
-rw-r--r--sys/dev/ic/rt2860.c4
-rw-r--r--sys/dev/ic/sili.c6
-rw-r--r--sys/dev/pci/if_age.c4
-rw-r--r--sys/dev/pci/if_alc.c4
-rw-r--r--sys/dev/pci/if_ale.c4
-rw-r--r--sys/dev/pci/if_iwi.c3
-rw-r--r--sys/dev/pci/if_vte.c4
-rw-r--r--sys/dev/pci/ixgbe.h4
-rw-r--r--sys/dev/rndvar.h5
-rw-r--r--sys/dev/softraid.c3
-rw-r--r--sys/dev/softraid_crypto.c3
-rw-r--r--sys/dev/softraid_raid0.c3
-rw-r--r--sys/dev/softraid_raid1.c3
-rw-r--r--sys/dev/softraid_raid5.c3
-rw-r--r--sys/dev/usb/ehci.c4
-rw-r--r--sys/dev/usb/if_uath.c3
-rw-r--r--sys/dev/usb/if_wi_usb.c4
19 files changed, 19 insertions, 53 deletions
diff --git a/sys/dev/ic/if_wi.c b/sys/dev/ic/if_wi.c
index 2cf14762ea1..aa33896893b 100644
--- a/sys/dev/ic/if_wi.c
+++ b/sys/dev/ic/if_wi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi.c,v 1.157 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: if_wi.c,v 1.158 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 1997, 1998, 1999
@@ -92,8 +92,6 @@
#include <machine/bus.h>
-#include <dev/rndvar.h>
-
#include <dev/ic/if_wireg.h>
#include <dev/ic/if_wi_ieee.h>
#include <dev/ic/if_wivar.h>
diff --git a/sys/dev/ic/if_wi_hostap.c b/sys/dev/ic/if_wi_hostap.c
index e56fdfb245e..9d7b06429a1 100644
--- a/sys/dev/ic/if_wi_hostap.c
+++ b/sys/dev/ic/if_wi_hostap.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_hostap.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: if_wi_hostap.c,v 1.47 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2002
@@ -67,8 +67,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_ioctl.h>
-#include <dev/rndvar.h>
-
#include <dev/ic/if_wireg.h>
#include <dev/ic/if_wi_ieee.h>
#include <dev/ic/if_wivar.h>
diff --git a/sys/dev/ic/rt2860.c b/sys/dev/ic/rt2860.c
index 7779e768bb0..52fa1167557 100644
--- a/sys/dev/ic/rt2860.c
+++ b/sys/dev/ic/rt2860.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rt2860.c,v 1.75 2014/09/06 05:41:35 jsg Exp $ */
+/* $OpenBSD: rt2860.c,v 1.76 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2007-2010 Damien Bergamini <damien.bergamini@free.fr>
@@ -60,8 +60,6 @@
#include <dev/pci/pcidevs.h>
-#include <dev/rndvar.h>
-
#ifdef RAL_DEBUG
#define DPRINTF(x) do { if (rt2860_debug > 0) printf x; } while (0)
#define DPRINTFN(n, x) do { if (rt2860_debug >= (n)) printf x; } while (0)
diff --git a/sys/dev/ic/sili.c b/sys/dev/ic/sili.c
index ada875c50bb..84fdd83a2f1 100644
--- a/sys/dev/ic/sili.c
+++ b/sys/dev/ic/sili.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sili.c,v 1.54 2014/09/14 14:17:25 jsg Exp $ */
+/* $OpenBSD: sili.c,v 1.55 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -55,10 +55,6 @@ int sili_error_pmp_ports = 0; /* bitmask containing ports to fail*/
int sili_error_test_inv_p = 500; /* 1/P(error) */
int sili_error_restart_type = SILI_PREG_PCS_PORTINIT; /* or _DEVRESET */
-#ifdef SILI_ERROR_TEST
-#include <dev/rndvar.h>
-#endif
-
struct cfdriver sili_cd = {
NULL, "sili", DV_DULL
};
diff --git a/sys/dev/pci/if_age.c b/sys/dev/pci/if_age.c
index f9bfec43a6a..b3083a86ce1 100644
--- a/sys/dev/pci/if_age.c
+++ b/sys/dev/pci/if_age.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_age.c,v 1.23 2014/08/19 16:13:25 miod Exp $ */
+/* $OpenBSD: if_age.c,v 1.24 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
@@ -62,8 +62,6 @@
#include <net/bpf.h>
#endif
-#include <dev/rndvar.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_alc.c b/sys/dev/pci/if_alc.c
index 453baf44225..4667d5040d2 100644
--- a/sys/dev/pci/if_alc.c
+++ b/sys/dev/pci/if_alc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_alc.c,v 1.27 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_alc.c,v 1.28 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -61,8 +61,6 @@
#include <net/bpf.h>
#endif
-#include <dev/rndvar.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_ale.c b/sys/dev/pci/if_ale.c
index b75655ed387..02b4a044a15 100644
--- a/sys/dev/pci/if_ale.c
+++ b/sys/dev/pci/if_ale.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ale.c,v 1.31 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_ale.c,v 1.32 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2008, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -65,8 +65,6 @@
#include <net/bpf.h>
#endif
-#include <dev/rndvar.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/if_iwi.c b/sys/dev/pci/if_iwi.c
index c6baddbbeec..5e506e42b4e 100644
--- a/sys/dev/pci/if_iwi.c
+++ b/sys/dev/pci/if_iwi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_iwi.c,v 1.118 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_iwi.c,v 1.119 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2004-2008
@@ -56,7 +56,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_radiotap.h>
-#include <dev/rndvar.h>
#include <crypto/arc4.h>
#include <dev/pci/if_iwireg.h>
diff --git a/sys/dev/pci/if_vte.c b/sys/dev/pci/if_vte.c
index 3fc50284a46..7c5b9943738 100644
--- a/sys/dev/pci/if_vte.c
+++ b/sys/dev/pci/if_vte.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vte.c,v 1.9 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: if_vte.c,v 1.10 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2010, Pyun YongHyeon <yongari@FreeBSD.org>
* All rights reserved.
@@ -61,8 +61,6 @@
#include <net/bpf.h>
#endif
-#include <dev/rndvar.h>
-
#include <dev/mii/mii.h>
#include <dev/mii/miivar.h>
diff --git a/sys/dev/pci/ixgbe.h b/sys/dev/pci/ixgbe.h
index 07ca29729b8..4583869f7e6 100644
--- a/sys/dev/pci/ixgbe.h
+++ b/sys/dev/pci/ixgbe.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ixgbe.h,v 1.16 2014/07/22 13:12:11 mpi Exp $ */
+/* $OpenBSD: ixgbe.h,v 1.17 2014/11/18 02:37:30 tedu Exp $ */
/******************************************************************************
@@ -76,8 +76,6 @@ typedef int boolean_t;
#define TRUE 1
#define FALSE 0
-#include <dev/rndvar.h>
-
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <dev/pci/pcidevs.h>
diff --git a/sys/dev/rndvar.h b/sys/dev/rndvar.h
index 17cc93c7bf4..5907e26b10e 100644
--- a/sys/dev/rndvar.h
+++ b/sys/dev/rndvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: rndvar.h,v 1.33 2014/01/19 23:52:54 deraadt Exp $ */
+/* $OpenBSD: rndvar.h,v 1.34 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 1996,2000 Michael Shalayeff.
@@ -72,9 +72,6 @@ extern struct rndstats rndstats;
void random_start(void);
void enqueue_randomness(int, int);
-void arc4random_buf(void *, size_t);
-u_int32_t arc4random(void);
-u_int32_t arc4random_uniform(u_int32_t);
#endif /* _KERNEL */
diff --git a/sys/dev/softraid.c b/sys/dev/softraid.c
index 233c9defb7e..7065bd9fa83 100644
--- a/sys/dev/softraid.c
+++ b/sys/dev/softraid.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid.c,v 1.343 2014/10/30 19:07:54 tedu Exp $ */
+/* $OpenBSD: softraid.c,v 1.344 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2007, 2008, 2009 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Chris Kuethe <ckuethe@openbsd.org>
@@ -49,7 +49,6 @@
#include <scsi/scsi_disk.h>
#include <dev/softraidvar.h>
-#include <dev/rndvar.h>
#ifdef HIBERNATE
#include <lib/libsa/aes_xts.h>
diff --git a/sys/dev/softraid_crypto.c b/sys/dev/softraid_crypto.c
index 28960f95494..6588c011023 100644
--- a/sys/dev/softraid_crypto.c
+++ b/sys/dev/softraid_crypto.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_crypto.c,v 1.114 2014/10/30 17:26:23 tedu Exp $ */
+/* $OpenBSD: softraid_crypto.c,v 1.115 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
* Copyright (c) 2008 Hans-Joerg Hoexer <hshoexer@openbsd.org>
@@ -54,7 +54,6 @@
#include <scsi/scsi_disk.h>
#include <dev/softraidvar.h>
-#include <dev/rndvar.h>
/*
* The per-I/O data that we need to preallocate. We cannot afford to allow I/O
diff --git a/sys/dev/softraid_raid0.c b/sys/dev/softraid_raid0.c
index 532fb492549..510fa443b50 100644
--- a/sys/dev/softraid_raid0.c
+++ b/sys/dev/softraid_raid0.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid0.c,v 1.46 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: softraid_raid0.c,v 1.47 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2008 Marco Peereboom <marco@peereboom.us>
*
@@ -40,7 +40,6 @@
#include <scsi/scsi_disk.h>
#include <dev/softraidvar.h>
-#include <dev/rndvar.h>
/* RAID 0 functions. */
int sr_raid0_create(struct sr_discipline *, struct bioc_createraid *,
diff --git a/sys/dev/softraid_raid1.c b/sys/dev/softraid_raid1.c
index c22871c3ee5..7317ac0d371 100644
--- a/sys/dev/softraid_raid1.c
+++ b/sys/dev/softraid_raid1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid1.c,v 1.58 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: softraid_raid1.c,v 1.59 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2007 Marco Peereboom <marco@peereboom.us>
*
@@ -42,7 +42,6 @@
#include <scsi/scsi_disk.h>
#include <dev/softraidvar.h>
-#include <dev/rndvar.h>
/* RAID 1 functions. */
int sr_raid1_create(struct sr_discipline *, struct bioc_createraid *,
diff --git a/sys/dev/softraid_raid5.c b/sys/dev/softraid_raid5.c
index ce1d19f2f48..60f9a064f2d 100644
--- a/sys/dev/softraid_raid5.c
+++ b/sys/dev/softraid_raid5.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: softraid_raid5.c,v 1.16 2014/09/14 14:17:24 jsg Exp $ */
+/* $OpenBSD: softraid_raid5.c,v 1.17 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2014 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2009 Marco Peereboom <marco@peereboom.us>
@@ -44,7 +44,6 @@
#include <scsi/scsi_disk.h>
#include <dev/softraidvar.h>
-#include <dev/rndvar.h>
/* RAID 5 functions. */
int sr_raid5_create(struct sr_discipline *, struct bioc_createraid *,
diff --git a/sys/dev/usb/ehci.c b/sys/dev/usb/ehci.c
index 50f889326ea..d46fa003ba0 100644
--- a/sys/dev/usb/ehci.c
+++ b/sys/dev/usb/ehci.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ehci.c,v 1.169 2014/10/05 08:40:29 mpi Exp $ */
+/* $OpenBSD: ehci.c,v 1.170 2014/11/18 02:37:30 tedu Exp $ */
/* $NetBSD: ehci.c,v 1.66 2004/06/30 03:11:56 mycroft Exp $ */
/*
@@ -61,8 +61,6 @@
#include <dev/usb/ehcireg.h>
#include <dev/usb/ehcivar.h>
-#include <dev/rndvar.h>
-
struct cfdriver ehci_cd = {
NULL, "ehci", DV_DULL
};
diff --git a/sys/dev/usb/if_uath.c b/sys/dev/usb/if_uath.c
index 5af46a20549..636da5f8090 100644
--- a/sys/dev/usb/if_uath.c
+++ b/sys/dev/usb/if_uath.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_uath.c,v 1.62 2014/11/01 14:44:08 mpi Exp $ */
+/* $OpenBSD: if_uath.c,v 1.63 2014/11/18 02:37:30 tedu Exp $ */
/*-
* Copyright (c) 2006
@@ -57,7 +57,6 @@
#include <net80211/ieee80211_var.h>
#include <net80211/ieee80211_radiotap.h>
-#include <dev/rndvar.h>
#include <crypto/arc4.h>
#include <dev/usb/usb.h>
diff --git a/sys/dev/usb/if_wi_usb.c b/sys/dev/usb/if_wi_usb.c
index 80bba4ec546..bf6a2e36936 100644
--- a/sys/dev/usb/if_wi_usb.c
+++ b/sys/dev/usb/if_wi_usb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_wi_usb.c,v 1.63 2014/07/13 15:52:49 mpi Exp $ */
+/* $OpenBSD: if_wi_usb.c,v 1.64 2014/11/18 02:37:30 tedu Exp $ */
/*
* Copyright (c) 2003 Dale Rahn. All rights reserved.
@@ -65,8 +65,6 @@
#include <machine/bus.h>
-#include <dev/rndvar.h>
-
#include <dev/ic/if_wireg.h>
#include <dev/ic/if_wi_ieee.h>
#include <dev/ic/if_wivar.h>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 19:03:00 +0000