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 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@xxxxxxxxxxxxxxxx

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: pgp00000.pgp
Description: PGP signature