diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/media/video/saa7115.c | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/media/video/saa7115.c')
| -rw-r--r-- | drivers/media/video/saa7115.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/saa7115.c b/drivers/media/video/saa7115.c index 048d000941c7..ffd87ce55556 100644 --- a/drivers/media/video/saa7115.c +++ b/drivers/media/video/saa7115.c | |||
| @@ -1027,7 +1027,7 @@ static struct v4l2_queryctrl saa7115_qctrl[] = { | |||
| 1027 | .type = V4L2_CTRL_TYPE_INTEGER, | 1027 | .type = V4L2_CTRL_TYPE_INTEGER, |
| 1028 | .name = "Contrast", | 1028 | .name = "Contrast", |
| 1029 | .minimum = 0, | 1029 | .minimum = 0, |
| 1030 | .maximum = 255, | 1030 | .maximum = 127, |
| 1031 | .step = 1, | 1031 | .step = 1, |
| 1032 | .default_value = 64, | 1032 | .default_value = 64, |
| 1033 | .flags = 0, | 1033 | .flags = 0, |
| @@ -1036,7 +1036,7 @@ static struct v4l2_queryctrl saa7115_qctrl[] = { | |||
| 1036 | .type = V4L2_CTRL_TYPE_INTEGER, | 1036 | .type = V4L2_CTRL_TYPE_INTEGER, |
| 1037 | .name = "Saturation", | 1037 | .name = "Saturation", |
| 1038 | .minimum = 0, | 1038 | .minimum = 0, |
| 1039 | .maximum = 255, | 1039 | .maximum = 127, |
| 1040 | .step = 1, | 1040 | .step = 1, |
| 1041 | .default_value = 64, | 1041 | .default_value = 64, |
| 1042 | .flags = 0, | 1042 | .flags = 0, |