linux-next: manual merge of the moduleh tree with the v4l-dvb tree

linux-next: manual merge of the moduleh tree with the v4l-dvb tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
sound/i2c/other/tea575x-tuner.c between commit 4522e825dbfc ("[media]
tea575x: convert to control framework") from the v4l-dvb tree and commit
a319a4d494d5 ("sound: Add module.h to the previously silent sound users")
from the moduleh tree.

Just context changes.  I fixed it up (see below) anc can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc sound/i2c/other/tea575x-tuner.c
index 484a35b,c65c624..0000000
--- a/sound/i2c/other/tea575x-tuner.c
+++ b/sound/i2c/other/tea575x-tuner.c
@@@ -25,8 -25,9 +25,9 @@@
  #include <linux/init.h>
  #include <linux/slab.h>
  #include <linux/version.h>
+ #include <linux/module.h>
 -#include <sound/core.h>
 +#include <media/v4l2-dev.h>
 +#include <media/v4l2-ioctl.h>
  #include <sound/tea575x-tuner.h>
  
  MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");

Re: linux-next: manual merge of the moduleh tree with the v4l-dvb tree

[Paul Gortmaker]

[linux-next: manual merge of the moduleh tree with the v4l-dvb tree] On 29/07/2011 (Fri 14:47) Stephen Rothwell wrote:

> Hi Paul,
> 
> Today's linux-next merge of the moduleh tree got a conflict in
> sound/i2c/other/tea575x-tuner.c between commit 4522e825dbfc ("[media]
> tea575x: convert to control framework") from the v4l-dvb tree and commit
> a319a4d494d5 ("sound: Add module.h to the previously silent sound users")
> from the moduleh tree.
> 
> Just context changes.  I fixed it up (see below) anc can carry the fix as
> necessary.

Seems 4522e825dbfc is in master now, so I've done the fixup locally
and you shouldn't see this crop up again.

Thanks,
Paul.

> -- 
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au
> 
> diff --cc sound/i2c/other/tea575x-tuner.c
> index 484a35b,c65c624..0000000
> --- a/sound/i2c/other/tea575x-tuner.c
> +++ b/sound/i2c/other/tea575x-tuner.c
> @@@ -25,8 -25,9 +25,9 @@@
>   #include <linux/init.h>
>   #include <linux/slab.h>
>   #include <linux/version.h>
> + #include <linux/module.h>
>  -#include <sound/core.h>
>  +#include <media/v4l2-dev.h>
>  +#include <media/v4l2-ioctl.h>
>   #include <sound/tea575x-tuner.h>
>   
>   MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");

linux-next: manual merge of the moduleh tree with the v4l-dvb tree

[Stephen Rothwell]

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"
  

linux-next: manual merge of the moduleh tree with the v4l-dvb tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]

Hi Paul,

Today's linux-next merge of the moduleh tree got conflicts in
drivers/media/video/mt9m111.c and drivers/media/video/ov6650.c between
commit 95d20109ad64 ("[media] V4L: replace soc-camera specific
soc_mediabus.h with v4l2-mediabus.h") from the v4l-dvb tree and commit
7a707b89202f ("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/video/mt9m111.c
index f023cc0,66e3c3c..0000000
--- a/drivers/media/video/mt9m111.c
+++ b/drivers/media/video/mt9m111.c
@@@ -13,12 -13,11 +13,13 @@@
  #include <linux/log2.h>
  #include <linux/gpio.h>
  #include <linux/delay.h>
 +#include <linux/v4l2-mediabus.h>
+ #include <linux/module.h>
  
 +#include <media/soc_camera.h>
  #include <media/v4l2-common.h>
 +#include <media/v4l2-ctrls.h>
  #include <media/v4l2-chip-ident.h>
 -#include <media/soc_camera.h>
  
  /*
   * MT9M111, MT9M112 and MT9M131:
diff --cc drivers/media/video/ov6650.c
index d5b0572,2e16806..0000000
--- a/drivers/media/video/ov6650.c
+++ b/drivers/media/video/ov6650.c
@@@ -28,7 -28,7 +28,8 @@@
  #include <linux/delay.h>
  #include <linux/i2c.h>
  #include <linux/slab.h>
 +#include <linux/v4l2-mediabus.h>
+ #include <linux/module.h>
  
  #include <media/soc_camera.h>
  #include <media/v4l2-chip-ident.h>

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]