From 2afb277f09e70f6f520d54a538a1459bcb8d16e4 Mon Sep 17 00:00:00 2001 From: Gleb Smirnoff Date: Wed, 5 Oct 2005 10:07:27 +0000 Subject: [PATCH] - Don't include opt_global.h, it is always included implicitly. - Include opt_device_polling.h --- sys/dev/lmc/if_lmc.c | 4 +++- sys/modules/lmc/Makefile | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/sys/dev/lmc/if_lmc.c b/sys/dev/lmc/if_lmc.c index 6a50e8add3b9..2f2b358d9961 100644 --- a/sys/dev/lmc/if_lmc.c +++ b/sys/dev/lmc/if_lmc.c @@ -77,11 +77,13 @@ # include "opt_inet.h" /* INET */ # include "opt_inet6.h" /* INET6 */ # include "opt_netgraph.h" /* NETGRAPH */ +# ifdef HAVE_KERNEL_OPTION_HEADERS +# include "opt_device_polling.h" /* DEVICE_POLLING */ +# endif # ifndef NETGRAPH # define NETGRAPH 0 # endif # define P2P 0 /* not in FreeBSD */ -# include "opt_global.h"/* ALTQ, DEVICE_POLLING */ # if (__FreeBSD_version >= 500000) # define NSPPP 1 /* No count devices in FreeBSD 5 */ # include "opt_bpf.h" /* DEV_BPF */ diff --git a/sys/modules/lmc/Makefile b/sys/modules/lmc/Makefile index cdeaa6b9b024..70e27b50eddd 100644 --- a/sys/modules/lmc/Makefile +++ b/sys/modules/lmc/Makefile @@ -18,7 +18,6 @@ opt_netgraph.h: echo "#define NETGRAPH 1" > ${.TARGET} opt_global.h: echo "#define ALTQ 1" > ${.TARGET} - echo "#define DEVICE_POLLING 0" >> ${.TARGET} opt_bpf.h: # FreeBSD-5: echo "#define DEV_BPF 1" > ${.TARGET}