]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
authorLuciano Coelho <coelho@ti.com>
Thu, 1 Dec 2011 10:14:48 +0000 (12:14 +0200)
committerLuciano Coelho <coelho@ti.com>
Thu, 1 Dec 2011 10:14:48 +0000 (12:14 +0200)
1  2 
drivers/net/wireless/wl12xx/boot.c
drivers/net/wireless/wl12xx/scan.c
drivers/net/wireless/wl12xx/spi.c

index 4ce634b925cb0ad5e16dadad4f1d654e54d37b54,6813379149767ea4c6236d6b43a0f1f0c219c8d1..6e140bf4e23666f8baf689320f2ab24e2c03482f
@@@ -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"
Simple merge
Simple merge