Merge tag 'hisi-fixes-for-4.14' of git://github.com/hisilicon/linux-hisi into next...

[sfrench/cifs-2.6.git] / drivers / staging / media / atomisp / i2c / gc0310.h

diff --git a/drivers/staging/media/atomisp/i2c/gc0310.h b/drivers/staging/media/atomisp/i2c/gc0310.h
index f31eb277f5428f98711ea235bc9dca1ba7ba1a1f..7d8a0aeecb6c1f20998d2c0f334a97aa004d4ac9 100644 (file)
--- a/drivers/staging/media/atomisp/i2c/gc0310.h
+++ b/drivers/staging/media/atomisp/i2c/gc0310.h
@@ -454,6 +454,6 @@ struct gc0310_resolution gc0310_res_video[] = {
 #define N_RES_VIDEO (ARRAY_SIZE(gc0310_res_video))
 
 static struct gc0310_resolution *gc0310_res = gc0310_res_preview;
-static int N_RES = N_RES_PREVIEW;
+static unsigned long N_RES = N_RES_PREVIEW;
 #endif