PERFORCE change 107748 for review

[Hans Petter Selasky]

http://perforce.freebsd.org/chv.cgi?CH=107748

Change 107748 by hselasky at hselasky_mini_itx on 2006/10/12 08:32:37

	Compile fixes for FreeBSD 6.x

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/if_ural.c#15 edit
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#12 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#15 (text+ko) ====

@@ -942,7 +942,9 @@
 	ic->ic_reset = &ural_reset_cb;
 
 	/* enable SW bmiss handling in sta mode */
+#if (defined(IEEE80211_FEXT_SWBMISS) || (__FreeBSD_version >= 700022))
 	ic->ic_flags_ext |= IEEE80211_FEXT_SWBMISS;
+#endif
 
 	/* override state transition machine */
 	sc->sc_newstate = ic->ic_newstate;

==== //depot/projects/usb/src/sys/dev/usb/ucom.c#12 (text+ko) ====

@@ -323,7 +323,7 @@
 
 	DPRINTF(0, "tp = %p, unit = %d\n", tp, sc->sc_unit);
 
-#ifndef TS_CALLOUT
+#if !(defined(TS_CALLOUT) || (__FreeBSD_version >= 700022))
 #define TS_CALLOUT NULL, sc->sc_unit, MINOR_CALLOUT /* compile fix for FreeBSD 6.x */
 #endif
 	error = ttycreate(tp, TS_CALLOUT, "U%d", sc->sc_unit);