linux-next: manual merge of the moduleh tree with thestaging.current tree

[Stephen Rothwell]

Hi Paul,

Today's linux-next merge of the moduleh tree got a conflict in
drivers/staging/dt3155v4l/dt3155v4l.c between commit dac95cb8cf40
("drivers/staging/dt3155v4l/dt3155v4l.c needs slab.h") from the
staging.current tree and commit 9e1049c45c01 ("staging: Add module.h to
drivers/staging users") from the moduleh tree.

Also note that commit 5c751107250f ("staging: fix implicit use of slab.h
in dt3155v4l/dt3155v4l.c") from the moduleh tree is a duplicate of the
above staging.current tree commit (with the include in a slightly
different spot.

I fixed it up (see below) anc can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/staging/dt3155v4l/dt3155v4l.c
index 05aa41c,024390b..0000000
--- a/drivers/staging/dt3155v4l/dt3155v4l.c
+++ b/drivers/staging/dt3155v4l/dt3155v4l.c
@@@ -21,8 -21,9 +21,9 @@@
  #include <linux/version.h>
  #include <linux/stringify.h>
  #include <linux/delay.h>
 -#include <linux/slab.h>
  #include <linux/kthread.h>
 +#include <linux/slab.h>
+ #include <linux/module.h>
  #include <media/v4l2-dev.h>
  #include <media/v4l2-ioctl.h>
  #include <media/videobuf2-dma-contig.h>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/