diff options
Diffstat (limited to 'drivers/media/video/saa6588.c')
-rw-r--r-- | drivers/media/video/saa6588.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/saa6588.c b/drivers/media/video/saa6588.c index 984c0feb2a4e..99a2ac16f9e5 100644 --- a/drivers/media/video/saa6588.c +++ b/drivers/media/video/saa6588.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
32 | #include <asm/uaccess.h> | 32 | #include <asm/uaccess.h> |
33 | 33 | ||
34 | #include <media/rds.h> | 34 | #include <media/saa6588.h> |
35 | #include <media/v4l2-device.h> | 35 | #include <media/v4l2-device.h> |
36 | #include <media/v4l2-chip-ident.h> | 36 | #include <media/v4l2-chip-ident.h> |
37 | 37 | ||
@@ -181,7 +181,7 @@ static int block_to_user_buf(struct saa6588 *s, unsigned char __user *user_buf) | |||
181 | return 1; | 181 | return 1; |
182 | } | 182 | } |
183 | 183 | ||
184 | static void read_from_buf(struct saa6588 *s, struct rds_command *a) | 184 | static void read_from_buf(struct saa6588 *s, struct saa6588_command *a) |
185 | { | 185 | { |
186 | unsigned long flags; | 186 | unsigned long flags; |
187 | 187 | ||
@@ -392,25 +392,25 @@ static void saa6588_configure(struct saa6588 *s) | |||
392 | static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) | 392 | static long saa6588_ioctl(struct v4l2_subdev *sd, unsigned int cmd, void *arg) |
393 | { | 393 | { |
394 | struct saa6588 *s = to_saa6588(sd); | 394 | struct saa6588 *s = to_saa6588(sd); |
395 | struct rds_command *a = arg; | 395 | struct saa6588_command *a = arg; |
396 | 396 | ||
397 | switch (cmd) { | 397 | switch (cmd) { |
398 | /* --- open() for /dev/radio --- */ | 398 | /* --- open() for /dev/radio --- */ |
399 | case RDS_CMD_OPEN: | 399 | case SAA6588_CMD_OPEN: |
400 | a->result = 0; /* return error if chip doesn't work ??? */ | 400 | a->result = 0; /* return error if chip doesn't work ??? */ |
401 | break; | 401 | break; |
402 | /* --- close() for /dev/radio --- */ | 402 | /* --- close() for /dev/radio --- */ |
403 | case RDS_CMD_CLOSE: | 403 | case SAA6588_CMD_CLOSE: |
404 | s->data_available_for_read = 1; | 404 | s->data_available_for_read = 1; |
405 | wake_up_interruptible(&s->read_queue); | 405 | wake_up_interruptible(&s->read_queue); |
406 | a->result = 0; | 406 | a->result = 0; |
407 | break; | 407 | break; |
408 | /* --- read() for /dev/radio --- */ | 408 | /* --- read() for /dev/radio --- */ |
409 | case RDS_CMD_READ: | 409 | case SAA6588_CMD_READ: |
410 | read_from_buf(s, a); | 410 | read_from_buf(s, a); |
411 | break; | 411 | break; |
412 | /* --- poll() for /dev/radio --- */ | 412 | /* --- poll() for /dev/radio --- */ |
413 | case RDS_CMD_POLL: | 413 | case SAA6588_CMD_POLL: |
414 | a->result = 0; | 414 | a->result = 0; |
415 | if (s->data_available_for_read) { | 415 | if (s->data_available_for_read) { |
416 | a->result |= POLLIN | POLLRDNORM; | 416 | a->result |= POLLIN | POLLRDNORM; |