summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorriastradh <riastradh@NetBSD.org>2020-03-05 15:18:54 +0000
committerriastradh <riastradh@NetBSD.org>2020-03-05 15:18:54 +0000
commit8fd614bdaa07c01313bc37fa1478278c17edbfe8 (patch)
tree74d04d48afee489bdddc8bfc4b7d73045254358a /sys/dev
parentc25d10cb9f7de5c72cc0ab4207c19cb612bc3587 (diff)
Revert "Include opt_diagnostic.h for DIAGNOSTIC."
This did not do what I thought it did. opt_diagnostic.h is only for the unused _DIAGNOSTIC, which seems like an abortive attempt to incrementally convert DIAGNOSTIC to an opt_*.h option rather than a command-line option.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/audio/audiodef.h3
-rw-r--r--sys/dev/audio/audiovar.h6
-rw-r--r--sys/dev/ic/dm9000var.h6
-rw-r--r--sys/dev/ic/tcic2var.h6
-rw-r--r--sys/dev/pci/eapvar.h6
5 files changed, 5 insertions, 22 deletions
diff --git a/sys/dev/audio/audiodef.h b/sys/dev/audio/audiodef.h
index 4b69cca4520..3b0700430ca 100644
--- a/sys/dev/audio/audiodef.h
+++ b/sys/dev/audio/audiodef.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audiodef.h,v 1.11 2020/03/05 08:08:33 riastradh Exp $ */
+/* $NetBSD: audiodef.h,v 1.12 2020/03/05 15:18:55 riastradh Exp $ */
/*
* Copyright (C) 2017 Tetsuya Isaki. All rights reserved.
@@ -31,7 +31,6 @@
#ifdef _KERNEL_OPT
#include "opt_audio.h"
-#include "opt_diagnostic.h"
#endif
/* Number of HW buffer's blocks. */
diff --git a/sys/dev/audio/audiovar.h b/sys/dev/audio/audiovar.h
index 4075485a2bc..707cae41552 100644
--- a/sys/dev/audio/audiovar.h
+++ b/sys/dev/audio/audiovar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: audiovar.h,v 1.9 2020/03/05 08:08:33 riastradh Exp $ */
+/* $NetBSD: audiovar.h,v 1.10 2020/03/05 15:18:55 riastradh Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -67,10 +67,6 @@
#ifndef _SYS_DEV_AUDIO_AUDIOVAR_H_
#define _SYS_DEV_AUDIO_AUDIOVAR_H_
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
#include <sys/condvar.h>
#include <sys/proc.h>
#include <sys/pserialize.h>
diff --git a/sys/dev/ic/dm9000var.h b/sys/dev/ic/dm9000var.h
index a6e50c3a4f5..b46f71cf1b4 100644
--- a/sys/dev/ic/dm9000var.h
+++ b/sys/dev/ic/dm9000var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: dm9000var.h,v 1.4 2020/03/05 08:08:33 riastradh Exp $ */
+/* $NetBSD: dm9000var.h,v 1.5 2020/03/05 15:18:55 riastradh Exp $ */
/*
* Copyright (c) 2009 Paul Fleischer
@@ -63,10 +63,6 @@
#ifndef _DEV_IC_DM9000VAR_H_
#define _DEV_IC_DM9000VAR_H_
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
#include <sys/callout.h>
#define DM9000_MODE_8BIT 2
diff --git a/sys/dev/ic/tcic2var.h b/sys/dev/ic/tcic2var.h
index 7161911b336..12083ad3ee0 100644
--- a/sys/dev/ic/tcic2var.h
+++ b/sys/dev/ic/tcic2var.h
@@ -1,4 +1,4 @@
-/* $NetBSD: tcic2var.h,v 1.14 2020/03/05 08:08:33 riastradh Exp $ */
+/* $NetBSD: tcic2var.h,v 1.15 2020/03/05 15:18:55 riastradh Exp $ */
/*
* Copyright (c) 1998, 1999 Christoph Badura. All rights reserved.
@@ -33,10 +33,6 @@
#ifndef _TCIC2VAR_H
#define _TCIC2VAR_H
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
-
#include <sys/device.h>
#include <dev/pcmcia/pcmciareg.h>
diff --git a/sys/dev/pci/eapvar.h b/sys/dev/pci/eapvar.h
index 8f6f03d9028..1e6c2324126 100644
--- a/sys/dev/pci/eapvar.h
+++ b/sys/dev/pci/eapvar.h
@@ -1,8 +1,4 @@
-/* $NetBSD: eapvar.h,v 1.5 2020/03/05 08:08:33 riastradh Exp $ */
-
-#ifdef _KERNEL_OPT
-#include "opt_diagnostic.h"
-#endif
+/* $NetBSD: eapvar.h,v 1.6 2020/03/05 15:18:55 riastradh Exp $ */
#include <dev/pci/pcivar.h>