[src/pgoyette-compat]: src/sys/net80211 No need to make the #include conditio...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/3660f356980d
branches:  pgoyette-compat
changeset: 830524:3660f356980d
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Wed Mar 28 00:30:05 2018 +0000

description:
No need to make the #include conditional;  the included file contains
all required conditions.

diffstat:

 sys/net80211/ieee80211_ioctl.c |  9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r d62e87dff1fc -r 3660f356980d sys/net80211/ieee80211_ioctl.c
--- a/sys/net80211/ieee80211_ioctl.c    Tue Mar 27 23:11:18 2018 +0000
+++ b/sys/net80211/ieee80211_ioctl.c    Wed Mar 28 00:30:05 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ieee80211_ioctl.c,v 1.60 2015/08/24 22:21:26 pooka Exp $       */
+/*     $NetBSD: ieee80211_ioctl.c,v 1.60.16.1 2018/03/28 00:30:05 pgoyette Exp $       */
 /*-
  * Copyright (c) 2001 Atsushi Onoe
  * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
@@ -36,7 +36,7 @@
 __FBSDID("$FreeBSD: src/sys/net80211/ieee80211_ioctl.c,v 1.35 2005/08/30 14:27:47 avatar Exp $");
 #endif
 #ifdef __NetBSD__
-__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60 2015/08/24 22:21:26 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ieee80211_ioctl.c,v 1.60.16.1 2018/03/28 00:30:05 pgoyette Exp $");
 #endif
 
 /*
@@ -72,12 +72,7 @@
 
 #include <dev/ic/wi_ieee.h>
 
-#if defined(COMPAT_09) || defined(COMPAT_10) || defined(COMPAT_11) || \
-    defined(COMPAT_12) || defined(COMPAT_13) || defined(COMPAT_14) || \
-    defined(COMPAT_15) || defined(COMPAT_16) || defined(COMPAT_20) || \
-    defined(COMPAT_30) || defined(COMPAT_40)
 #include <compat/sys/sockio.h>
-#endif
 
 #ifdef __FreeBSD__
 #define        IS_UP(_ic) \