Messages in this thread | | | Date | Tue, 27 Sep 2011 16:26:31 +1000 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the moduleh tree with the v4l-dvb tree |
| |
Hi Paul,
Today's linux-next merge of the moduleh tree got a conflict in drivers/media/dvb/frontends/dibx000_common.c between commit 79fcce3230b1 ("[media] DiBcom: protect the I2C bufer access") from the v4l-dvb tree and commit 32ee0bf69471 ("drivers/media: Add module.h to all files using it implicitly") from the moduleh tree.
Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/media/dvb/frontends/dibx000_common.c index 774d507,977211f..0000000 --- a/drivers/media/dvb/frontends/dibx000_common.c +++ b/drivers/media/dvb/frontends/dibx000_common.c @@@ -1,5 -1,5 +1,6 @@@ #include <linux/i2c.h> +#include <linux/mutex.h> + #include <linux/module.h> #include "dibx000_common.h"
| |