diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 22:03:53 -0500 |
| commit | 9da305eb089c94c535d1790fd2dec16f44c1689f (patch) | |
| tree | f37f07f148fd7a793233c7f15c0fa9f46212049d /drivers/media/dvb/ttpci/av7110_hw.c | |
| parent | d96212ed87d032d2d830e265aae14038dc1f8ad8 (diff) | |
| parent | 14ee0a1414536d27bc29373bf23c106b8ef8ce0b (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/media/dvb/ttpci/av7110_hw.c')
| -rw-r--r-- | drivers/media/dvb/ttpci/av7110_hw.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/media/dvb/ttpci/av7110_hw.c b/drivers/media/dvb/ttpci/av7110_hw.c index 7442f56a72ec..87106e8bf35b 100644 --- a/drivers/media/dvb/ttpci/av7110_hw.c +++ b/drivers/media/dvb/ttpci/av7110_hw.c | |||
| @@ -1203,15 +1203,15 @@ int av7110_osd_cmd(struct av7110 *av7110, osd_cmd_t *dc) | |||
| 1203 | 1203 | ||
| 1204 | int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap) | 1204 | int av7110_osd_capability(struct av7110 *av7110, osd_cap_t *cap) |
| 1205 | { | 1205 | { |
| 1206 | switch (cap->cmd) { | 1206 | switch (cap->cmd) { |
| 1207 | case OSD_CAP_MEMSIZE: | 1207 | case OSD_CAP_MEMSIZE: |
| 1208 | if (FW_4M_SDRAM(av7110->arm_app)) | 1208 | if (FW_4M_SDRAM(av7110->arm_app)) |
| 1209 | cap->val = 1000000; | 1209 | cap->val = 1000000; |
| 1210 | else | 1210 | else |
| 1211 | cap->val = 92000; | 1211 | cap->val = 92000; |
| 1212 | return 0; | 1212 | return 0; |
| 1213 | default: | 1213 | default: |
| 1214 | return -EINVAL; | 1214 | return -EINVAL; |
| 1215 | } | 1215 | } |
| 1216 | } | 1216 | } |
| 1217 | #endif /* CONFIG_DVB_AV7110_OSD */ | 1217 | #endif /* CONFIG_DVB_AV7110_OSD */ |