Messages in this thread | | | Date | Tue, 6 Jul 2010 12:01:13 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the v4l-dvb tree with Linus' tree |
| |
Hi Mauro,
Today's linux-next merge of the v4l-dvb tree got a conflict in drivers/staging/tm6000/tm6000-alsa.c between commit 4ef09889d7b4c7be2aa3e132efb77029f51c95b7 ("v4l-dvb: update gfp/slab.h includes") from Linus' tree and commit 813605a98db924123530784d29964e99a705482d ("tm6000-alsa: rework audio buffer allocation/deallocation") from the v4l-dvb tree.
Just overlapping additions. I fixed ti up (see below) and can carry the fix for a while. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/staging/tm6000/tm6000-alsa.c index 273e26e,aa38577..0000000 --- a/drivers/staging/tm6000/tm6000-alsa.c +++ b/drivers/staging/tm6000/tm6000-alsa.c @@@ -15,7 -15,7 +15,8 @@@ #include <linux/device.h> #include <linux/interrupt.h> #include <linux/usb.h> +#include <linux/slab.h> + #include <linux/vmalloc.h> #include <asm/delay.h> #include <sound/core.h>
| |