From: Andrew Morton <akpm@linux-foundation.org>

Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/media/video/ivtv/ivtv-driver.h |    4 --
 drivers/media/video/zoran_driver.c     |   37 -----------------------
 include/linux/i2c-id.h                 |    1 
 3 files changed, 1 insertion(+), 41 deletions(-)

diff -puN drivers/media/video/zoran_driver.c~git-dvb-fixup drivers/media/video/zoran_driver.c
--- a/drivers/media/video/zoran_driver.c~git-dvb-fixup
+++ a/drivers/media/video/zoran_driver.c
@@ -127,7 +127,6 @@ const struct zoran_format zoran_formats[
 		.depth = 15,
 		.flags = ZORAN_FORMAT_CAPTURE |
 			 ZORAN_FORMAT_OVERLAY,
-<<<<<<< HEAD/drivers/media/video/zoran_driver.c
 		.vfespfr = ZR36057_VFESPFR_RGB555|ZR36057_VFESPFR_ErrDif,
 	}, {
 		.name = "16-bit RGB LE",
@@ -138,28 +137,10 @@ const struct zoran_format zoran_formats[
 			 ZORAN_FORMAT_OVERLAY,
 		.vfespfr = ZR36057_VFESPFR_RGB565|ZR36057_VFESPFR_ErrDif|
 			   ZR36057_VFESPFR_LittleEndian,
-=======
-		.vfespfr = ZR36057_VFESPFR_RGB555|ZR36057_VFESPFR_ErrDif,
->>>>>>> /drivers/media/video/zoran_driver.c
-	}, {
-<<<<<<< HEAD/drivers/media/video/zoran_driver.c
-		.name = "16-bit RGB BE",
-		ZFMT(-1,
-		     V4L2_PIX_FMT_RGB565, V4L2_COLORSPACE_SRGB),
-=======
-		.name = "16-bit RGB LE",
-		ZFMT(VIDEO_PALETTE_RGB565,
-		     V4L2_PIX_FMT_RGB565, V4L2_COLORSPACE_SRGB),
-		.depth = 16,
-		.flags = ZORAN_FORMAT_CAPTURE |
-			 ZORAN_FORMAT_OVERLAY,
-		.vfespfr = ZR36057_VFESPFR_RGB565|ZR36057_VFESPFR_ErrDif|
-			   ZR36057_VFESPFR_LittleEndian,
 	}, {
 		.name = "16-bit RGB BE",
 		ZFMT(-1,
 		     V4L2_PIX_FMT_RGB565, V4L2_COLORSPACE_SRGB),
->>>>>>> /drivers/media/video/zoran_driver.c
 		.depth = 16,
 		.flags = ZORAN_FORMAT_CAPTURE |
 			 ZORAN_FORMAT_OVERLAY,
@@ -171,21 +152,8 @@ const struct zoran_format zoran_formats[
 		.depth = 24,
 		.flags = ZORAN_FORMAT_CAPTURE |
 			 ZORAN_FORMAT_OVERLAY,
-<<<<<<< HEAD/drivers/media/video/zoran_driver.c
 		.vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_Pack24,
-=======
-		.vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_Pack24,
-	}, {
-		.name = "32-bit RGB LE",
-		ZFMT(VIDEO_PALETTE_RGB32,
-		     V4L2_PIX_FMT_BGR32, V4L2_COLORSPACE_SRGB),
-		.depth = 32,
-		.flags = ZORAN_FORMAT_CAPTURE |
-			 ZORAN_FORMAT_OVERLAY,
-		.vfespfr = ZR36057_VFESPFR_RGB888|ZR36057_VFESPFR_LittleEndian,
->>>>>>> /drivers/media/video/zoran_driver.c
 	}, {
-<<<<<<< HEAD/drivers/media/video/zoran_driver.c
 		.name = "32-bit RGB LE",
 		ZFMT(VIDEO_PALETTE_RGB32,
 		     V4L2_PIX_FMT_BGR32, V4L2_COLORSPACE_SRGB),
@@ -197,11 +165,6 @@ const struct zoran_format zoran_formats[
 		.name = "32-bit RGB BE",
 		ZFMT(-1,
 		     V4L2_PIX_FMT_RGB32, V4L2_COLORSPACE_SRGB),
-=======
-		.name = "32-bit RGB BE",
-		ZFMT(-1,
-		     V4L2_PIX_FMT_RGB32, V4L2_COLORSPACE_SRGB),
->>>>>>> /drivers/media/video/zoran_driver.c
 		.depth = 32,
 		.flags = ZORAN_FORMAT_CAPTURE |
 			 ZORAN_FORMAT_OVERLAY,
diff -puN drivers/media/video/ivtv/ivtv-driver.h~git-dvb-fixup drivers/media/video/ivtv/ivtv-driver.h
--- a/drivers/media/video/ivtv/ivtv-driver.h~git-dvb-fixup
+++ a/drivers/media/video/ivtv/ivtv-driver.h
@@ -397,13 +397,9 @@ struct ivtv_mailbox_data {
 #define IVTV_F_I_WORK_HANDLER_YUV  17	/* there is work to be done for YUV */
 #define IVTV_F_I_WORK_HANDLER_PIO  18	/* there is work to be done for PIO */
 #define IVTV_F_I_PIO		   19	/* PIO in progress */
-<<<<<<< HEAD/drivers/media/video/ivtv/ivtv-driver.h
-#define IVTV_F_I_DEC_PAUSED	   20 	/* the decoder is paused */
-=======
 #define IVTV_F_I_DEC_PAUSED	   20 	/* the decoder is paused */
 #define IVTV_F_I_INITED		   21 	/* set after first open */
 #define IVTV_F_I_FAILED		   22 	/* set if first open failed */
->>>>>>> /drivers/media/video/ivtv/ivtv-driver.h
 
 /* Event notifications */
 #define IVTV_F_I_EV_DEC_STOPPED	   28	/* decoder stopped event */
diff -puN include/linux/i2c-id.h~git-dvb-fixup include/linux/i2c-id.h
--- a/include/linux/i2c-id.h~git-dvb-fixup
+++ a/include/linux/i2c-id.h
@@ -120,6 +120,7 @@
 #define I2C_DRIVERID_WM8753	91	/* Wolfson WM8753 audio codec */
 #define I2C_DRIVERID_LM4857 	92 	/* LM4857 Audio Amplifier */
 #define I2C_DRIVERID_CS4270	93	/* Cirrus Logic 4270 audio codec */
+#define I2C_DRIVERID_VP27SMPX	94	/* Panasonic VP27s tuner internal MPX */
 
 #define I2C_DRIVERID_I2CDEV	900
 #define I2C_DRIVERID_ARP        902    /* SMBus ARP Client              */
_