- Don't pollute opt_global.h with DEVICE_POLLING and introduce

  opt_device_polling.h
- Include opt_device_polling.h into appropriate files.
- Embrace with HAVE_KERNEL_OPTION_HEADERS the include in the files that
  can be compiled as loadable modules.

Reviewed by:	bde

11 files changed, 42 insertions, 0 deletions

diff --git a/sys/dev/dc/if_dc.c b/sys/dev/dc/if_dc.c
index a6f4304..d4322d5 100644
--- a/sys/dev/dc/if_dc.c
+++ b/sys/dev/dc/if_dc.c
@@ -91,6 +91,10 @@ __FBSDID("$FreeBSD$");
  * AX88140A doesn't support internal NWAY.
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/em/if_em.c b/sys/dev/em/if_em.c
index 3b5db52..8e87a2a 100644
--- a/sys/dev/em/if_em.c
+++ b/sys/dev/em/if_em.c
@@ -33,6 +33,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /*$FreeBSD$*/
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <dev/em/if_em.h>
 
 /*********************************************************************
diff --git a/sys/dev/firewire/if_fwe.c b/sys/dev/firewire/if_fwe.c
index 1bf1bcd..83c57ac 100644
--- a/sys/dev/firewire/if_fwe.c
+++ b/sys/dev/firewire/if_fwe.c
@@ -34,7 +34,10 @@
  * $FreeBSD$
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
 #include "opt_inet.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/firewire/if_fwip.c b/sys/dev/firewire/if_fwip.c
index b3fdda4..0d7e5fe 100644
--- a/sys/dev/firewire/if_fwip.c
+++ b/sys/dev/firewire/if_fwip.c
@@ -36,7 +36,10 @@
  * $FreeBSD$
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
 #include "opt_inet.h"
+#endif
 
 #include <sys/param.h>
 #include <sys/kernel.h>
diff --git a/sys/dev/fxp/if_fxp.c b/sys/dev/fxp/if_fxp.c
index 133a96a..638c8df 100644
--- a/sys/dev/fxp/if_fxp.c
+++ b/sys/dev/fxp/if_fxp.c
@@ -34,6 +34,10 @@ __FBSDID("$FreeBSD$");
  * Intel EtherExpress Pro/100B PCI Fast Ethernet driver
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/endian.h>
diff --git a/sys/dev/ixgb/if_ixgb.c b/sys/dev/ixgb/if_ixgb.c
index d273542..eb7d8be 100644
--- a/sys/dev/ixgb/if_ixgb.c
+++ b/sys/dev/ixgb/if_ixgb.c
@@ -33,6 +33,10 @@ POSSIBILITY OF SUCH DAMAGE.
 
 /*$FreeBSD$*/
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <dev/ixgb/if_ixgb.h>
 
 /*********************************************************************
diff --git a/sys/dev/nge/if_nge.c b/sys/dev/nge/if_nge.c
index e8a89ea..2a944cc 100644
--- a/sys/dev/nge/if_nge.c
+++ b/sys/dev/nge/if_nge.c
@@ -88,6 +88,10 @@ __FBSDID("$FreeBSD$");
  * if the user selects an MTU larger than 8152 (8170 - 18).
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/re/if_re.c b/sys/dev/re/if_re.c
index 72fff4e..820415d 100644
--- a/sys/dev/re/if_re.c
+++ b/sys/dev/re/if_re.c
@@ -108,6 +108,10 @@ __FBSDID("$FreeBSD$");
  * driver is 7422 bytes.
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/sf/if_sf.c b/sys/dev/sf/if_sf.c
index 691a0f6..7b2538b 100644
--- a/sys/dev/sf/if_sf.c
+++ b/sys/dev/sf/if_sf.c
@@ -79,6 +79,10 @@ __FBSDID("$FreeBSD$");
  * registers inside the 256-byte I/O window.
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>
diff --git a/sys/dev/vge/if_vge.c b/sys/dev/vge/if_vge.c
index 9101945..8219b89 100644
--- a/sys/dev/vge/if_vge.c
+++ b/sys/dev/vge/if_vge.c
@@ -80,6 +80,10 @@ __FBSDID("$FreeBSD$");
  * and sample NICs for testing.
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/endian.h>
 #include <sys/systm.h>
diff --git a/sys/dev/vr/if_vr.c b/sys/dev/vr/if_vr.c
index b3c92ea..8f15b84 100644
--- a/sys/dev/vr/if_vr.c
+++ b/sys/dev/vr/if_vr.c
@@ -60,6 +60,10 @@ __FBSDID("$FreeBSD$");
  * transmission.
  */
 
+#ifdef HAVE_KERNEL_OPTION_HEADERS
+#include "opt_device_polling.h"
+#endif
+
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/sockio.h>