From: "Art Haas" <ahaas@airmail.net>
Here's a small patch changing the GNU-style initializers to C99
initializers.
---
25-akpm/drivers/media/common/saa7146_video.c | 62 +++++++++++++--------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff -puN drivers/media/common/saa7146_video.c~saa7146_video-c99-fixes drivers/media/common/saa7146_video.c
--- 25/drivers/media/common/saa7146_video.c~saa7146_video-c99-fixes Wed Feb 25 13:28:43 2004
+++ 25-akpm/drivers/media/common/saa7146_video.c Wed Feb 25 13:28:43 2004
@@ -381,41 +381,41 @@ static int s_fmt(struct saa7146_fh *fh,
static struct v4l2_queryctrl controls[] = {
{
- id: V4L2_CID_BRIGHTNESS,
- name: "Brightness",
- minimum: 0,
- maximum: 255,
- step: 1,
- default_value: 128,
- type: V4L2_CTRL_TYPE_INTEGER,
+ .id = V4L2_CID_BRIGHTNESS,
+ .name = "Brightness",
+ .minimum = 0,
+ .maximum = 255,
+ .step = 1,
+ .default_value = 128,
+ .type = V4L2_CTRL_TYPE_INTEGER,
},{
- id: V4L2_CID_CONTRAST,
- name: "Contrast",
- minimum: 0,
- maximum: 127,
- step: 1,
- default_value: 64,
- type: V4L2_CTRL_TYPE_INTEGER,
+ .id = V4L2_CID_CONTRAST,
+ .name = "Contrast",
+ .minimum = 0,
+ .maximum = 127,
+ .step = 1,
+ .default_value = 64,
+ .type = V4L2_CTRL_TYPE_INTEGER,
},{
- id: V4L2_CID_SATURATION,
- name: "Saturation",
- minimum: 0,
- maximum: 127,
- step: 1,
- default_value: 64,
- type: V4L2_CTRL_TYPE_INTEGER,
+ .id = V4L2_CID_SATURATION,
+ .name = "Saturation",
+ .minimum = 0,
+ .maximum = 127,
+ .step = 1,
+ .default_value = 64,
+ .type = V4L2_CTRL_TYPE_INTEGER,
},{
- id: V4L2_CID_VFLIP,
- name: "Vertical flip",
- minimum: 0,
- maximum: 1,
- type: V4L2_CTRL_TYPE_BOOLEAN,
+ .id = V4L2_CID_VFLIP,
+ .name = "Vertical flip",
+ .minimum = 0,
+ .maximum = 1,
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
},{
- id: V4L2_CID_HFLIP,
- name: "Horizontal flip",
- minimum: 0,
- maximum: 1,
- type: V4L2_CTRL_TYPE_BOOLEAN,
+ .id = V4L2_CID_HFLIP,
+ .name = "Horizontal flip",
+ .minimum = 0,
+ .maximum = 1,
+ .type = V4L2_CTRL_TYPE_BOOLEAN,
},
};
static int NUM_CONTROLS = sizeof(controls)/sizeof(struct v4l2_queryctrl);
_