iwlwifi: mvm: fix merge damage
authorEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 16 Mar 2014 06:51:47 +0000 (08:51 +0200)
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Sun, 16 Mar 2014 06:51:47 +0000 (08:51 +0200)
commit833df4a81d06830bd4d24ad26b76656f62d5fac1
treef0259a868f2f84fa95523103f746fe0cb38968bc
parentb797e3fbab399ed023bdaeaf7fb63236f67eaa1c
iwlwifi: mvm: fix merge damage

Scheduled scan was disabled because it was broken. Now it is
fixed and got disabled by mistake by a merge.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
drivers/net/wireless/iwlwifi/mvm/mac80211.c