diff options
Diffstat (limited to 'drivers/media/video/bt8xx/bttv-driver.c')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-driver.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c index 961d0805d877..849cd170b821 100644 --- a/drivers/media/video/bt8xx/bttv-driver.c +++ b/drivers/media/video/bt8xx/bttv-driver.c | |||
@@ -55,7 +55,7 @@ | |||
55 | #include <asm/io.h> | 55 | #include <asm/io.h> |
56 | #include <asm/byteorder.h> | 56 | #include <asm/byteorder.h> |
57 | 57 | ||
58 | #include <media/rds.h> | 58 | #include <media/saa6588.h> |
59 | 59 | ||
60 | 60 | ||
61 | unsigned int bttv_num; /* number of Bt848s in use */ | 61 | unsigned int bttv_num; /* number of Bt848s in use */ |
@@ -3388,7 +3388,7 @@ static int radio_release(struct file *file) | |||
3388 | { | 3388 | { |
3389 | struct bttv_fh *fh = file->private_data; | 3389 | struct bttv_fh *fh = file->private_data; |
3390 | struct bttv *btv = fh->btv; | 3390 | struct bttv *btv = fh->btv; |
3391 | struct rds_command cmd; | 3391 | struct saa6588_command cmd; |
3392 | 3392 | ||
3393 | v4l2_prio_close(&btv->prio, fh->prio); | 3393 | v4l2_prio_close(&btv->prio, fh->prio); |
3394 | file->private_data = NULL; | 3394 | file->private_data = NULL; |
@@ -3396,7 +3396,7 @@ static int radio_release(struct file *file) | |||
3396 | 3396 | ||
3397 | btv->radio_user--; | 3397 | btv->radio_user--; |
3398 | 3398 | ||
3399 | bttv_call_all(btv, core, ioctl, RDS_CMD_CLOSE, &cmd); | 3399 | bttv_call_all(btv, core, ioctl, SAA6588_CMD_CLOSE, &cmd); |
3400 | 3400 | ||
3401 | return 0; | 3401 | return 0; |
3402 | } | 3402 | } |
@@ -3523,13 +3523,13 @@ static ssize_t radio_read(struct file *file, char __user *data, | |||
3523 | { | 3523 | { |
3524 | struct bttv_fh *fh = file->private_data; | 3524 | struct bttv_fh *fh = file->private_data; |
3525 | struct bttv *btv = fh->btv; | 3525 | struct bttv *btv = fh->btv; |
3526 | struct rds_command cmd; | 3526 | struct saa6588_command cmd; |
3527 | cmd.block_count = count/3; | 3527 | cmd.block_count = count/3; |
3528 | cmd.buffer = data; | 3528 | cmd.buffer = data; |
3529 | cmd.instance = file; | 3529 | cmd.instance = file; |
3530 | cmd.result = -ENODEV; | 3530 | cmd.result = -ENODEV; |
3531 | 3531 | ||
3532 | bttv_call_all(btv, core, ioctl, RDS_CMD_READ, &cmd); | 3532 | bttv_call_all(btv, core, ioctl, SAA6588_CMD_READ, &cmd); |
3533 | 3533 | ||
3534 | return cmd.result; | 3534 | return cmd.result; |
3535 | } | 3535 | } |
@@ -3538,11 +3538,11 @@ static unsigned int radio_poll(struct file *file, poll_table *wait) | |||
3538 | { | 3538 | { |
3539 | struct bttv_fh *fh = file->private_data; | 3539 | struct bttv_fh *fh = file->private_data; |
3540 | struct bttv *btv = fh->btv; | 3540 | struct bttv *btv = fh->btv; |
3541 | struct rds_command cmd; | 3541 | struct saa6588_command cmd; |
3542 | cmd.instance = file; | 3542 | cmd.instance = file; |
3543 | cmd.event_list = wait; | 3543 | cmd.event_list = wait; |
3544 | cmd.result = -ENODEV; | 3544 | cmd.result = -ENODEV; |
3545 | bttv_call_all(btv, core, ioctl, RDS_CMD_POLL, &cmd); | 3545 | bttv_call_all(btv, core, ioctl, SAA6588_CMD_POLL, &cmd); |
3546 | 3546 | ||
3547 | return cmd.result; | 3547 | return cmd.result; |
3548 | } | 3548 | } |