From: Luciano Coelho <coelho@ti.com>
Date: Thu, 1 Dec 2011 10:14:48 +0000 (+0200)
Subject: Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel... 
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=e4da3fbfbd1de56d2367653e3823e6445e49f8a9;p=linux-edison.git

Merge branch 'master' of git://git./linux/kernel/git/linville/wireless-next into wl12xx-next
---

e4da3fbfbd1de56d2367653e3823e6445e49f8a9
diff --cc drivers/net/wireless/wl12xx/boot.c
index 4ce634b925c,68133791497..6e140bf4e23
--- a/drivers/net/wireless/wl12xx/boot.c
+++ b/drivers/net/wireless/wl12xx/boot.c
@@@ -23,8 -23,8 +23,9 @@@
  
  #include <linux/slab.h>
  #include <linux/wl12xx.h>
+ #include <linux/export.h>
  
 +#include "debug.h"
  #include "acx.h"
  #include "reg.h"
  #include "boot.h"