diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/video/gspca/mars.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/video/gspca/mars.c')
| -rw-r--r-- | drivers/media/video/gspca/mars.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/gspca/mars.c b/drivers/media/video/gspca/mars.c index 9cf8d68c71bf..3d9229e22b25 100644 --- a/drivers/media/video/gspca/mars.c +++ b/drivers/media/video/gspca/mars.c | |||
| @@ -54,7 +54,7 @@ static int sd_getgamma(struct gspca_dev *gspca_dev, __s32 *val); | |||
| 54 | static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val); | 54 | static int sd_setsharpness(struct gspca_dev *gspca_dev, __s32 val); |
| 55 | static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val); | 55 | static int sd_getsharpness(struct gspca_dev *gspca_dev, __s32 *val); |
| 56 | 56 | ||
| 57 | static struct ctrl sd_ctrls[] = { | 57 | static const struct ctrl sd_ctrls[] = { |
| 58 | { | 58 | { |
| 59 | { | 59 | { |
| 60 | .id = V4L2_CID_BRIGHTNESS, | 60 | .id = V4L2_CID_BRIGHTNESS, |