Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

This commit is contained in:
John W. Linville 2014-03-19 15:14:07 -04:00
commit 8f63e23aa4

View file

@ -60,6 +60,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*****************************************************************************/
#include <linux/vmalloc.h>
#include "mvm.h"
#include "sta.h"
#include "iwl-io.h"