Hi John, Today's linux-next merge of the wireless tree got a conflict in drivers/net/wireless/rtlwifi/rtl8192cu/sw.c between commit 9d9779e723a5 ("drivers/net: Add module.h to drivers who were implicitly using it") from the tree and commit e97173c985c0 ("rtl8192cu: Fix WARNING on suspend/resume") from the wireless tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx diff --cc drivers/net/wireless/rtlwifi/rtl8192cu/sw.c index c244f2f,a48bea6..0000000 --- a/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c +++ b/drivers/net/wireless/rtlwifi/rtl8192cu/sw.c @@@ -42,7 -42,8 +42,9 @@@ #include "led.h" #include "hw.h" #include <linux/vmalloc.h> +#include <linux/module.h> + #include <linux/atomic.h> + #include <linux/types.h> MODULE_AUTHOR("Georgia <georgia@xxxxxxxxxxx>"); MODULE_AUTHOR("Ziv Huang <ziv_huang@xxxxxxxxxxx>");
Attachment:
pgpNjcfrvSPQG.pgp
Description: PGP signature