svn commit: r210729 - stable/8/sys/conf

[Bernhard Schmidt]

Author: bschmidt
Date: Sun Aug  1 12:05:27 2010
New Revision: 210729
URL: http://svn.freebsd.org/changeset/base/210729

Log:
  MFC r206426:
  Building wlan_amrr is now mandatory.

Modified:
  stable/8/sys/conf/files
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/conf/files
==============================================================================
--- stable/8/sys/conf/files	Sun Aug  1 11:12:42 2010	(r210728)
+++ stable/8/sys/conf/files	Sun Aug  1 12:05:27 2010	(r210729)
@@ -2367,7 +2367,7 @@ net80211/ieee80211_action.c	optional wla
 net80211/ieee80211_ageq.c	optional wlan
 net80211/ieee80211_adhoc.c	optional wlan
 net80211/ieee80211_ageq.c	optional wlan
-net80211/ieee80211_amrr.c	optional wlan wlan_amrr
+net80211/ieee80211_amrr.c	optional wlan | wlan_amrr
 net80211/ieee80211_crypto.c	optional wlan
 net80211/ieee80211_crypto_ccmp.c optional wlan wlan_ccmp
 net80211/ieee80211_crypto_none.c optional wlan