summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base')
-rw-r--r--abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base76
1 files changed, 0 insertions, 76 deletions
diff --git a/abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base b/abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base
deleted file mode 100644
index 694a2f6..0000000
--- a/abs/core-testing/plextor-convertX-driver/.svn/text-base/wis-go-0.9.8-2.6.17.patch.svn-base
+++ /dev/null
@@ -1,76 +0,0 @@
-diff -ur wis-go7007-linux-0.9.8/kernel/go7007-usb.c wis-go7007-linux-0.9.8-new/kernel/go7007-usb.c
---- wis-go7007-linux-0.9.8/kernel/go7007-usb.c 2006-04-02 00:57:04.000000000 +0200
-+++ wis-go7007-linux-0.9.8-new/kernel/go7007-usb.c 2006-04-03 12:58:44.000000000 +0200
-@@ -27,7 +27,7 @@
- #include <linux/usb.h>
- #include <linux/i2c.h>
- #include <asm/byteorder.h>
--#include <media/audiochip.h>
-+#include <media/tvaudio.h>
-
- #include "go7007-priv.h"
- #include "wis-i2c.h"
-@@ -225,17 +225,17 @@
- .inputs = {
- {
- .video_input = 1,
-- .audio_input = AUDIO_EXTERN,
-+ .audio_input = TVAUDIO_INPUT_EXTERN,
- .name = "Composite",
- },
- {
- .video_input = 8,
-- .audio_input = AUDIO_EXTERN,
-+ .audio_input = TVAUDIO_INPUT_EXTERN,
- .name = "S-Video",
- },
- {
- .video_input = 3,
-- .audio_input = AUDIO_TUNER,
-+ .audio_input = TVAUDIO_INPUT_TUNER,
- .name = "Tuner",
- },
- },
-diff -ur wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c wis-go7007-linux-0.9.8-new/kernel/go7007-v4l2.c
---- wis-go7007-linux-0.9.8/kernel/go7007-v4l2.c 2006-04-02 01:22:03.000000000 +0200
-+++ wis-go7007-linux-0.9.8-new/kernel/go7007-v4l2.c 2006-04-03 12:55:52.000000000 +0200
-@@ -939,7 +939,7 @@
- if (go->i2c_adapter_online) {
- i2c_clients_command(&go->i2c_adapter, DECODER_SET_INPUT,
- &go->board_info->inputs[*input].video_input);
-- i2c_clients_command(&go->i2c_adapter, AUDC_SET_INPUT,
-+ i2c_clients_command(&go->i2c_adapter, VIDIOC_S_AUDIO,
- &go->board_info->inputs[*input].audio_input);
- }
- return 0;
-diff -ur wis-go7007-linux-0.9.8/kernel/wis-uda1342.c wis-go7007-linux-0.9.8-new/kernel/wis-uda1342.c
---- wis-go7007-linux-0.9.8/kernel/wis-uda1342.c 2006-04-02 00:37:32.000000000 +0200
-+++ wis-go7007-linux-0.9.8-new/kernel/wis-uda1342.c 2006-04-03 13:07:04.000000000 +0200
-@@ -20,7 +20,7 @@
- #include <linux/version.h>
- #include <linux/i2c.h>
- #include <linux/videodev.h>
--#include <media/audiochip.h>
-+#include <media/tvaudio.h>
- #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
- #include <media/v4l2-common.h>
- #endif
-@@ -38,15 +38,15 @@
- unsigned int cmd, void *arg)
- {
- switch (cmd) {
-- case AUDC_SET_INPUT:
-+ case VIDIOC_S_AUDIO:
- {
- int *inp = arg;
-
- switch (*inp) {
-- case AUDIO_TUNER:
-+ case TVAUDIO_INPUT_TUNER:
- write_reg(client, 0x00, 0x1441); /* select input 2 */
- break;
-- case AUDIO_EXTERN:
-+ case TVAUDIO_INPUT_EXTERN:
- write_reg(client, 0x00, 0x1241); /* select input 1 */
- break;
- default: