diff options
author | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2005-07-13 15:15:43 -0400 |
commit | 99ad25a313bda566a346b46a6015afa65bc0a02b (patch) | |
tree | b9443fed1ab74f320c4ee0791864ee96d7c069df /drivers/media/video/tuner-3036.c | |
parent | f62c4a96f74d6c6dd56d1742697e94a5c2085e87 (diff) | |
parent | 9a556e89081b0c1c2f83cee915363b15a68a6f2d (diff) |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'drivers/media/video/tuner-3036.c')
-rw-r--r-- | drivers/media/video/tuner-3036.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c index 51748c6578d1..7d825e510ffd 100644 --- a/drivers/media/video/tuner-3036.c +++ b/drivers/media/video/tuner-3036.c | |||
@@ -152,7 +152,7 @@ tuner_command(struct i2c_client *client, unsigned int cmd, void *arg) | |||
152 | 152 | ||
153 | switch (cmd) | 153 | switch (cmd) |
154 | { | 154 | { |
155 | case TUNER_SET_TVFREQ: | 155 | case VIDIOCSFREQ: |
156 | set_tv_freq(client, *iarg); | 156 | set_tv_freq(client, *iarg); |
157 | break; | 157 | break; |
158 | 158 | ||