Klaus Klein <kleink@netbsd.org> writes:

> As discussed with Aymeric, <machine/intr.h> is always required, so don't
> make its inclusion conditional.

Thanks for doing it. I didn't because there is "prior art" for that:

(before your commit) :

vincent@fairness[6]%    pwd
/usr/src/sys/net
vincent@fairness[7]%    grep -C1 machine/intr *
if_gif.c-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
if_gif.c:#include <machine/intr.h>
if_gif.c-#endif
--
if_ppp.c-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
if_ppp.c:#include <machine/intr.h>
if_ppp.c-#endif
--
if_pppoe.c-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
if_pppoe.c:#include <machine/intr.h>
if_pppoe.c-#endif
--
if_sl.c-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
if_sl.c:#include <machine/intr.h>
if_sl.c-#endif
--
if_strip.c-#ifdef __HAVE_GENERIC_SOFT_INTERRUPTS
if_strip.c:#include <machine/intr.h>
if_strip.c-#endif
vincent@fairness[8]%

Maybe you should update the other files?

regards,
  Aymeric