git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
V4L/DVB (6092): ivtv: more cleanups, merged ivtv-audio.c and ivtv-video.c into ivtv...
[safe/jmp/linux-2.6]
/
drivers
/
media
/
video
/
ivtv
/
ivtv-ioctl.c
diff --git
a/drivers/media/video/ivtv/ivtv-ioctl.c
b/drivers/media/video/ivtv/ivtv-ioctl.c
index
bb59634
..
f4f56a6
100644
(file)
--- a/
drivers/media/video/ivtv/ivtv-ioctl.c
+++ b/
drivers/media/video/ivtv/ivtv-ioctl.c
@@
-25,8
+25,7
@@
#include "ivtv-queue.h"
#include "ivtv-fileops.h"
#include "ivtv-vbi.h"
#include "ivtv-queue.h"
#include "ivtv-fileops.h"
#include "ivtv-vbi.h"
-#include "ivtv-audio.h"
-#include "ivtv-video.h"
+#include "ivtv-routing.h"
#include "ivtv-streams.h"
#include "ivtv-yuv.h"
#include "ivtv-ioctl.h"
#include "ivtv-streams.h"
#include "ivtv-yuv.h"
#include "ivtv-ioctl.h"
@@
-675,7
+674,7
@@
static int ivtv_debug_ioctls(struct file *filp, unsigned int cmd, void *arg)
case VIDIOC_INT_S_AUDIO_ROUTING: {
struct v4l2_routing *route = arg;
case VIDIOC_INT_S_AUDIO_ROUTING: {
struct v4l2_routing *route = arg;
- ivtv_
audio_set_route(itv
, route);
+ ivtv_
i2c_hw(itv, itv->card->hw_audio, VIDIOC_INT_S_AUDIO_ROUTING
, route);
break;
}
break;
}