diff --git a/[refs] b/[refs]
index f8595d59b130..ef11718e6da1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf4805ee6a850e941110b0df1e96049287ecf75
+refs/heads/master: d9e2d5962b083646cc9c218bfd358d07ae3b5925
diff --git a/trunk/drivers/staging/easycap/easycap_settings.c b/trunk/drivers/staging/easycap/easycap_settings.c
index 3a81cc26df03..3a5295738c1c 100644
--- a/trunk/drivers/staging/easycap/easycap_settings.c
+++ b/trunk/drivers/staging/easycap/easycap_settings.c
@@ -316,10 +316,10 @@ fillin_formats(void)
 {
 int i, j, k, m, n;
 __u32 width, height, pixelformat, bytesperline, sizeimage;
-__u32 field, colorspace;
+enum v4l2_field field;
+enum v4l2_colorspace colorspace;
 __u16 mask1, mask2, mask3, mask4;
 char name1[32], name2[32], name3[32], name4[32];
-
 for (i = 0, n = 0; i < STANDARD_MANY; i++) {
 	mask1 = 0x0000;
 	switch (i) {