svn commit: r209569 - stable/8/sys/dev/ath/ath_hal/ar5416

[Rui Paulo]

Author: rpaulo
Date: Mon Jun 28 11:53:22 2010
New Revision: 209569
URL: http://svn.freebsd.org/changeset/base/209569

Log:
  MFC r209541, r209548:
  	Fix the AR_SREV_MERLIN_20_OR_LATER() check.

Modified:
  stable/8/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
==============================================================================
--- stable/8/sys/dev/ath/ath_hal/ar5416/ar5416reg.h	Mon Jun 28 10:50:14 2010	(r209568)
+++ stable/8/sys/dev/ath/ath_hal/ar5416/ar5416reg.h	Mon Jun 28 11:53:22 2010	(r209569)
@@ -612,7 +612,7 @@
 	 AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_MERLIN_20)
 #define	AR_SREV_MERLIN_20_OR_LATER(_ah) \
 	(AR_SREV_MERLIN_20(_ah) || \
-	 AH_PRIVATE((_ah))->ah_macVersion > AR_XSREV_VERSION_MERLIN)
+	 AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_MERLIN)
 
 #define	AR_SREV_KITE(_ah) \
 	(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_KITE)