[Midnightbsd-cvs] src: dev/wpi: remove __FreeBSD_version checks

[laffer1 at midnightbsd.org]

Log Message:
-----------
remove __FreeBSD_version checks

Modified Files:
--------------
    src/sys/dev/wpi:
        if_wpi.c (r1.2 -> r1.3)
        if_wpivar.h (r1.2 -> r1.3)

-------------- next part --------------
Index: if_wpivar.h
===================================================================
RCS file: /home/cvs/src/sys/dev/wpi/if_wpivar.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/dev/wpi/if_wpivar.h -L sys/dev/wpi/if_wpivar.h -u -r1.2 -r1.3
--- sys/dev/wpi/if_wpivar.h
+++ sys/dev/wpi/if_wpivar.h
@@ -17,11 +17,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#if ( __FreeBSD_version > 700000 )
 #include <net80211/ieee80211_amrr.h>
-#else
-#include <dev/wpi/ieee80211_amrr.h>
-#endif
 
 /* DMA mapping */
 struct wpi_mapping {
Index: if_wpi.c
===================================================================
RCS file: /home/cvs/src/sys/dev/wpi/if_wpi.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L sys/dev/wpi/if_wpi.c -L sys/dev/wpi/if_wpi.c -u -r1.2 -r1.3
--- sys/dev/wpi/if_wpi.c
+++ sys/dev/wpi/if_wpi.c
@@ -76,9 +76,7 @@
 #include <sys/linker.h>
 #include <sys/firmware.h>
 
-#if (__FreeBSD_version > 700000)
 #define WPI_CURRENT
-#endif
 
 #include <machine/bus.h>
 #include <machine/resource.h>
@@ -521,7 +519,6 @@
 		}
 	}
 
-#if __FreeBSD_version >= 700000
 	/*
 	 * Create the taskqueues used by the driver. Primarily
 	 * sc_tq handles most the task
@@ -535,9 +532,6 @@
 	    taskqueue_thread_enqueue, &sc->sc_tq2);
 	taskqueue_start_threads(&sc->sc_tq2, 1, PI_NET, "%s taskq2",
 	    device_get_nameunit(dev));
-#else
-#error "Sorry, this driver is not yet ready for FreeBSD < 7.0"
-#endif
 
 	/* Create the tasks that can be queued */
 #if 0