Messages in this thread | | | Date | Wed, 28 Sep 2011 16:40:57 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the staging tree |
| |
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in drivers/staging/brcm80211/brcmfmac/bcmsdh.c between commit 47b4c640b849 ("staging: brcm80211: remove global var gInstance from brcmfmac") from the staging tree and commit 15f310ea9641 ("staging: Add export.h for THIS_MODULE/EXPORT_SYMBOL to drivers/staging users") from the moduleh tree.
I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/brcm80211/brcmfmac/bcmsdh.c index 8448b8b,51f9335..0000000 --- a/drivers/staging/brcm80211/brcmfmac/bcmsdh.c +++ b/drivers/staging/brcm80211/brcmfmac/bcmsdh.c @@@ -21,9 -22,7 +22,10 @@@ #include <linux/pci_ids.h> #include <linux/sched.h> #include <linux/completion.h> +#include <linux/mmc/sdio.h> +#include <linux/mmc/sdio_func.h> +#include <linux/mmc/card.h> + #include <linux/export.h> #include <defs.h> #include <brcm_hw_ids.h>
| |