aboutsummaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorBrooks Davis <brooks@FreeBSD.org>2018-04-06 17:35:35 +0000
committerBrooks Davis <brooks@FreeBSD.org>2018-04-06 17:35:35 +0000
commit6469bdcdb6a5968dc7edfcfb495d427b4bfdb3dd (patch)
tree91aa218d5c7ba678789e2d491820dfe1e29122b4 /sys/dev
parentd9b41671bfa3cde03ac3795ef8320e718de20086 (diff)
Notes
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/aac/aac.c1
-rw-r--r--sys/dev/aacraid/aacraid.c1
-rw-r--r--sys/dev/acpica/acpi_hpet.c1
-rw-r--r--sys/dev/atkbdc/atkbd.c1
-rw-r--r--sys/dev/cy/cy.c2
-rw-r--r--sys/dev/drm2/drmP.h1
-rw-r--r--sys/dev/drm2/drm_ioc32.c2
-rw-r--r--sys/dev/drm2/i915/i915_ioc32.c2
-rw-r--r--sys/dev/drm2/radeon/radeon_ioc32.c2
-rw-r--r--sys/dev/filemon/filemon.c2
-rw-r--r--sys/dev/filemon/filemon_wrapper.c2
-rw-r--r--sys/dev/kbdmux/kbdmux.c1
-rw-r--r--sys/dev/md/md.c1
-rw-r--r--sys/dev/mfi/mfi.c1
-rw-r--r--sys/dev/mpr/mpr_user.c2
-rw-r--r--sys/dev/mps/mps_user.c2
-rw-r--r--sys/dev/mrsas/mrsas_linux.c1
-rw-r--r--sys/dev/null/null.c2
-rw-r--r--sys/dev/pci/pci_user.c1
-rw-r--r--sys/dev/rp/rp.c2
-rw-r--r--sys/dev/sio/sio.c1
-rw-r--r--sys/dev/syscons/scvidctl.c1
-rw-r--r--sys/dev/syscons/syscons.c1
-rw-r--r--sys/dev/uart/uart_kbd_sun.c1
-rw-r--r--sys/dev/usb/input/ukbd.c1
-rw-r--r--sys/dev/vkbd/vkbd.c1
-rw-r--r--sys/dev/vt/vt_core.c2
27 files changed, 1 insertions, 37 deletions
diff --git a/sys/dev/aac/aac.c b/sys/dev/aac/aac.c
index ed3a410fa6eb..f7ad60581180 100644
--- a/sys/dev/aac/aac.c
+++ b/sys/dev/aac/aac.c
@@ -38,7 +38,6 @@ __FBSDID("$FreeBSD$");
#define AAC_DRIVERNAME "aac"
#include "opt_aac.h"
-#include "opt_compat.h"
/* #include <stddef.h> */
#include <sys/param.h>
diff --git a/sys/dev/aacraid/aacraid.c b/sys/dev/aacraid/aacraid.c
index 192556440fda..d3ce34994da3 100644
--- a/sys/dev/aacraid/aacraid.c
+++ b/sys/dev/aacraid/aacraid.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
#define AAC_DRIVERNAME "aacraid"
#include "opt_aacraid.h"
-#include "opt_compat.h"
/* #include <stddef.h> */
#include <sys/param.h>
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c
index 053b956817a8..0736dfa39e95 100644
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@@ -29,7 +29,6 @@
__FBSDID("$FreeBSD$");
#include "opt_acpi.h"
-#include "opt_compat.h"
#if defined(__amd64__)
#define DEV_APIC
diff --git a/sys/dev/atkbdc/atkbd.c b/sys/dev/atkbdc/atkbd.c
index 895d358b3fa3..7a87e71928ba 100644
--- a/sys/dev/atkbdc/atkbd.c
+++ b/sys/dev/atkbdc/atkbd.c
@@ -30,7 +30,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
#include "opt_kbd.h"
#include "opt_atkbd.h"
#include "opt_evdev.h"
diff --git a/sys/dev/cy/cy.c b/sys/dev/cy/cy.c
index 2d4663bee492..3d397ae775cc 100644
--- a/sys/dev/cy/cy.c
+++ b/sys/dev/cy/cy.c
@@ -33,8 +33,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
/*
* TODO:
* Atomic COR change.
diff --git a/sys/dev/drm2/drmP.h b/sys/dev/drm2/drmP.h
index d3f6bfeac1ec..3af7ad11fa2e 100644
--- a/sys/dev/drm2/drmP.h
+++ b/sys/dev/drm2/drmP.h
@@ -121,7 +121,6 @@ struct drm_device;
#include <dev/drm2/drm_hashtab.h>
#include <dev/drm2/drm_mm.h>
-#include "opt_compat.h"
#include "opt_drm.h"
#include "opt_syscons.h"
#ifdef DRM_DEBUG
diff --git a/sys/dev/drm2/drm_ioc32.c b/sys/dev/drm2/drm_ioc32.c
index 7bbcd43fc44e..73e1c940ab0c 100644
--- a/sys/dev/drm2/drm_ioc32.c
+++ b/sys/dev/drm2/drm_ioc32.c
@@ -25,8 +25,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#ifdef COMPAT_FREEBSD32
#include <dev/drm2/drmP.h>
diff --git a/sys/dev/drm2/i915/i915_ioc32.c b/sys/dev/drm2/i915/i915_ioc32.c
index d9a5184c2ac2..44619ea647df 100644
--- a/sys/dev/drm2/i915/i915_ioc32.c
+++ b/sys/dev/drm2/i915/i915_ioc32.c
@@ -30,8 +30,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#ifdef COMPAT_FREEBSD32
/** @file i915_ioc32.c
diff --git a/sys/dev/drm2/radeon/radeon_ioc32.c b/sys/dev/drm2/radeon/radeon_ioc32.c
index 89ec8d7390d2..c517e6e3ee16 100644
--- a/sys/dev/drm2/radeon/radeon_ioc32.c
+++ b/sys/dev/drm2/radeon/radeon_ioc32.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#ifdef COMPAT_FREEBSD32
#include <dev/drm2/drmP.h>
diff --git a/sys/dev/filemon/filemon.c b/sys/dev/filemon/filemon.c
index 8ae6b55c44c8..38c4eb3f4a56 100644
--- a/sys/dev/filemon/filemon.c
+++ b/sys/dev/filemon/filemon.c
@@ -31,8 +31,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#include <sys/param.h>
#include <sys/file.h>
#include <sys/systm.h>
diff --git a/sys/dev/filemon/filemon_wrapper.c b/sys/dev/filemon/filemon_wrapper.c
index fbc101afda34..2b742d0dab8b 100644
--- a/sys/dev/filemon/filemon_wrapper.c
+++ b/sys/dev/filemon/filemon_wrapper.c
@@ -39,8 +39,6 @@ __FBSDID("$FreeBSD$");
#include <sys/sysent.h>
#include <sys/vnode.h>
-#include "opt_compat.h"
-
static eventhandler_tag filemon_exec_tag;
static eventhandler_tag filemon_exit_tag;
static eventhandler_tag filemon_fork_tag;
diff --git a/sys/dev/kbdmux/kbdmux.c b/sys/dev/kbdmux/kbdmux.c
index 7fee5d96fa46..4c6381dc850d 100644
--- a/sys/dev/kbdmux/kbdmux.c
+++ b/sys/dev/kbdmux/kbdmux.c
@@ -33,7 +33,6 @@
* $FreeBSD$
*/
-#include "opt_compat.h"
#include "opt_evdev.h"
#include "opt_kbd.h"
#include "opt_kbdmux.h"
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index d5908e771613..be661b2703c7 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -60,7 +60,6 @@
* From: src/sys/dev/vn/vn.c,v 1.122 2000/12/16 16:06:03
*/
-#include "opt_compat.h"
#include "opt_rootdevname.h"
#include "opt_geom.h"
#include "opt_md.h"
diff --git a/sys/dev/mfi/mfi.c b/sys/dev/mfi/mfi.c
index 3a9872f1b142..96c63fa3eb61 100644
--- a/sys/dev/mfi/mfi.c
+++ b/sys/dev/mfi/mfi.c
@@ -55,7 +55,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
#include "opt_mfi.h"
#include <sys/param.h>
diff --git a/sys/dev/mpr/mpr_user.c b/sys/dev/mpr/mpr_user.c
index 74c2a07b41c7..2c9354d12da3 100644
--- a/sys/dev/mpr/mpr_user.c
+++ b/sys/dev/mpr/mpr_user.c
@@ -63,8 +63,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
/* TODO Move headers to mprvar */
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/dev/mps/mps_user.c b/sys/dev/mps/mps_user.c
index a4535d06ab43..1770df60e1e2 100644
--- a/sys/dev/mps/mps_user.c
+++ b/sys/dev/mps/mps_user.c
@@ -65,8 +65,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
/* TODO Move headers to mpsvar */
#include <sys/types.h>
#include <sys/param.h>
diff --git a/sys/dev/mrsas/mrsas_linux.c b/sys/dev/mrsas/mrsas_linux.c
index 07dfe04da0d2..1794f977a21d 100644
--- a/sys/dev/mrsas/mrsas_linux.c
+++ b/sys/dev/mrsas/mrsas_linux.c
@@ -67,6 +67,7 @@ __FBSDID("$FreeBSD$");
#include <compat/linux/linux_util.h>
#include <dev/mrsas/mrsas.h>
+#undef COMPAT_FREEBSD32
#include <dev/mrsas/mrsas_ioctl.h>
/* There are multiple ioctl number ranges that need to be handled */
diff --git a/sys/dev/null/null.c b/sys/dev/null/null.c
index 923f8791ecec..c11a6fd8a102 100644
--- a/sys/dev/null/null.c
+++ b/sys/dev/null/null.c
@@ -32,8 +32,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/conf.h>
diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c
index 60b76b35f76a..229ca3a18db2 100644
--- a/sys/dev/pci/pci_user.c
+++ b/sys/dev/pci/pci_user.c
@@ -30,7 +30,6 @@
__FBSDID("$FreeBSD$");
#include "opt_bus.h" /* XXX trim includes */
-#include "opt_compat.h"
#include <sys/param.h>
#include <sys/systm.h>
diff --git a/sys/dev/rp/rp.c b/sys/dev/rp/rp.c
index 71e309625a25..74f08edb1808 100644
--- a/sys/dev/rp/rp.c
+++ b/sys/dev/rp/rp.c
@@ -40,8 +40,6 @@ __FBSDID("$FreeBSD$");
* rp.c - for RocketPort FreeBSD
*/
-#include "opt_compat.h"
-
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/endian.h>
diff --git a/sys/dev/sio/sio.c b/sys/dev/sio/sio.c
index 7406ad463914..d5d56fb97ed1 100644
--- a/sys/dev/sio/sio.c
+++ b/sys/dev/sio/sio.c
@@ -35,7 +35,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
#include "opt_gdb.h"
#include "opt_kdb.h"
#include "opt_sio.h"
diff --git a/sys/dev/syscons/scvidctl.c b/sys/dev/syscons/scvidctl.c
index 099185363ab6..78c11817dd92 100644
--- a/sys/dev/syscons/scvidctl.c
+++ b/sys/dev/syscons/scvidctl.c
@@ -32,7 +32,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
#include "opt_syscons.h"
#include <sys/param.h>
diff --git a/sys/dev/syscons/syscons.c b/sys/dev/syscons/syscons.c
index 2020436d89bf..5d9411a762c4 100644
--- a/sys/dev/syscons/syscons.c
+++ b/sys/dev/syscons/syscons.c
@@ -34,7 +34,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
#include "opt_syscons.h"
#include "opt_splash.h"
#include "opt_ddb.h"
diff --git a/sys/dev/uart/uart_kbd_sun.c b/sys/dev/uart/uart_kbd_sun.c
index 9cc15452f1aa..dac16188aa1c 100644
--- a/sys/dev/uart/uart_kbd_sun.c
+++ b/sys/dev/uart/uart_kbd_sun.c
@@ -29,7 +29,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
#include "opt_kbd.h"
#include "opt_sunkbd.h"
diff --git a/sys/dev/usb/input/ukbd.c b/sys/dev/usb/input/ukbd.c
index 9fb5f353d9db..072e374ed5dd 100644
--- a/sys/dev/usb/input/ukbd.c
+++ b/sys/dev/usb/input/ukbd.c
@@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$");
* HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf
*/
-#include "opt_compat.h"
#include "opt_kbd.h"
#include "opt_ukbd.h"
#include "opt_evdev.h"
diff --git a/sys/dev/vkbd/vkbd.c b/sys/dev/vkbd/vkbd.c
index f6454916368b..61695fa7725d 100644
--- a/sys/dev/vkbd/vkbd.c
+++ b/sys/dev/vkbd/vkbd.c
@@ -33,7 +33,6 @@
* $FreeBSD$
*/
-#include "opt_compat.h"
#include "opt_kbd.h"
#include <sys/param.h>
diff --git a/sys/dev/vt/vt_core.c b/sys/dev/vt/vt_core.c
index 91d48bf81df0..7fea5c2723ed 100644
--- a/sys/dev/vt/vt_core.c
+++ b/sys/dev/vt/vt_core.c
@@ -35,8 +35,6 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#include "opt_compat.h"
-
#include <sys/param.h>
#include <sys/consio.h>
#include <sys/eventhandler.h>