diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-13 13:18:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-04-13 13:18:36 -0700 |
| commit | ed668d5cf931126304ac04a3a58f82c71d44731e (patch) | |
| tree | 30e1c85a134a1da46e79462544ec57fe13036106 | |
| parent | e6172413816822cf920c00337e4d6c263006c798 (diff) | |
| download | patches-ed668d5cf931126304ac04a3a58f82c71d44731e.tar.gz | |
staging build fix
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | staging/staging-go7007-fix-build-issues.patch | 60 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 63 insertions, 1 deletions
@@ -102,6 +102,7 @@ staging/staging-sxg-use-correct-queue_id-for-transmitting-non-tcp-packets.patch staging/staging-sxg-fix-sleep-in-atomic-context-warning-while-loading-driver.patch staging/staging-sxg-fix-leaks-and-checksum-errors-in-transmit-code-path.patch +staging/staging-go7007-fix-build-issues.patch # for after .30: @@ -114,3 +115,4 @@ staging/staging-sxg-fix-leaks-and-checksum-errors-in-transmit-code-path.patch #staging/staging-add-intel-poulsbo-morrestown-drm-driver.patch +f.patch diff --git a/staging/staging-go7007-fix-build-issues.patch b/staging/staging-go7007-fix-build-issues.patch new file mode 100644 index 00000000000000..3cedfcf86dc418 --- /dev/null +++ b/staging/staging-go7007-fix-build-issues.patch @@ -0,0 +1,60 @@ +From foo@baz Mon Apr 13 13:16:54 PDT 2009 +Date: Mon, 13 Apr 2009 13:16:54 -0700 +To: Greg KH <greg@kroah.com> +From: Greg Kroah-Hartman <gregkh@suse.de> +Subject: Staging: go7007: fix build issues + +Now that TUNER_SET_TYPE_ADDR is gone from the tree, the older code kicks +in and tries to use TUNER_SET_TYPE, which went away a long time ago. + +This patch removes all of this logic, as it should not be needed anymore +now, and by doing so, fixes the build. + +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> +--- + drivers/staging/go7007/go7007-driver.c | 15 --------------- + drivers/staging/go7007/wis-sony-tuner.c | 2 ++ + 2 files changed, 2 insertions(+), 15 deletions(-) + +--- a/drivers/staging/go7007/go7007-driver.c ++++ b/drivers/staging/go7007/go7007-driver.c +@@ -268,21 +268,6 @@ int go7007_register_encoder(struct go700 + init_i2c_module(&go->i2c_adapter, + go->board_info->i2c_devs[i].id, + go->board_info->i2c_devs[i].addr); +-#ifdef TUNER_SET_TYPE_ADDR +- if (go->tuner_type >= 0) { +- struct tuner_setup tun_setup = { +- .mode_mask = T_ANALOG_TV, +- .addr = ADDR_UNSET, +- .type = go->tuner_type +- }; +- i2c_clients_command(&go->i2c_adapter, +- TUNER_SET_TYPE_ADDR, &tun_setup); +- } +-#else +- if (go->tuner_type >= 0) +- i2c_clients_command(&go->i2c_adapter, +- TUNER_SET_TYPE, &go->tuner_type); +-#endif + if (go->board_id == GO7007_BOARDID_ADLINK_MPG24) + i2c_clients_command(&go->i2c_adapter, + DECODER_SET_CHANNEL, &go->channel_number); +--- a/drivers/staging/go7007/wis-sony-tuner.c ++++ b/drivers/staging/go7007/wis-sony-tuner.c +@@ -386,6 +386,7 @@ static int tuner_command(struct i2c_clie + struct wis_sony_tuner *t = i2c_get_clientdata(client); + + switch (cmd) { ++#if 0 + #ifdef TUNER_SET_TYPE_ADDR + case TUNER_SET_TYPE_ADDR: + { +@@ -463,6 +464,7 @@ static int tuner_command(struct i2c_clie + t->type, sony_tuners[t->type - 200].name); + break; + } ++#endif + case VIDIOC_G_FREQUENCY: + { + struct v4l2_frequency *f = arg; @@ -1 +1 @@ -2.6.30-rc1 +2.6.30-rc1-git5 |