diff --git a/kernel/drivers/media/i2c/xs9922/xs9922.c b/kernel/drivers/media/i2c/xs9922/xs9922.c
index 49833af77..413e9d8af 100755
--- a/kernel/drivers/media/i2c/xs9922/xs9922.c
+++ b/kernel/drivers/media/i2c/xs9922/xs9922.c
@@ -227,7 +227,7 @@ static struct attribute_group dev_attr_grp = {
 };
 
 static const struct xs9922_mode supported_modes[] = {
-#ifndef RP_AHD_1080P
+//#ifndef RP_AHD_1080P
 	{
 		.bus_fmt = MEDIA_BUS_FMT_UYVY8_2X8,//MEDIA_BUS_FMT_UYVY8_2X8,
 		.width = 1280,
@@ -248,8 +248,12 @@ static const struct xs9922_mode supported_modes[] = {
 		.vc[PAD2] = V4L2_MBUS_CSI2_CHANNEL_2,
 		.vc[PAD3] = V4L2_MBUS_CSI2_CHANNEL_3,
 	},
-#endif
+//<<<<<<< Updated upstream
+/*#endif
+	{
+=======
 	{
+>>>>>>> Stashed changes
 		.bus_fmt = MEDIA_BUS_FMT_UYVY8_2X8,//MEDIA_BUS_FMT_UYVY8_2X8,
 		.width = 1920,
 		.height = 1080,
@@ -267,7 +271,7 @@ static const struct xs9922_mode supported_modes[] = {
 		.vc[PAD1] = V4L2_MBUS_CSI2_CHANNEL_1,
 		.vc[PAD2] = V4L2_MBUS_CSI2_CHANNEL_2,
 		.vc[PAD3] = V4L2_MBUS_CSI2_CHANNEL_3,
-	}
+	}*/
 };