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

From: Stephen Rothwell
Date: Tue Apr 06 2010 - 21:00:49 EST

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree got a conflict in
drivers/media/video/meye.c between commit
5a0e3ad6af8660be21ca98a971cd00f331318c05 ("include cleanup: Update gfp.h
and slab.h includes to prepare for breaking implicit slab.h inclusion
from percpu.h") from Linus' tree and commit
b214778b09229f9135e715bf346c25f98c8ac1e4 ("V4L/DVB: meye: remove last
V4L1 remnants from the code and add v4l2_device") from the v4l-dvb tree.

Just context changes. I fixed it up (see below) and can carry the change
for a while.
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/media/video/meye.c
index 4404e5e,9c7f282..0000000
--- a/drivers/media/video/meye.c
+++ b/drivers/media/video/meye.c
@@@ -30,9 -30,9 +30,10 @@@
#include <linux/pci.h>
#include <linux/sched.h>
#include <linux/init.h>
- #include <linux/videodev.h>
+ #include <linux/videodev2.h>
+#include <linux/gfp.h>
#include <media/v4l2-common.h>
+ #include <media/v4l2-device.h>
#include <media/v4l2-ioctl.h>
#include <asm/uaccess.h>
#include <asm/io.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
Please read the FAQ at