diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-18 05:37:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-18 05:37:43 -0400 |
| commit | 04dfcfcb54b073133bcca2c8f25b55e904558931 (patch) | |
| tree | 123d13f9e242751f629924e92fcb297dc669d767 /drivers/media/dvb/frontends/zl10353.h | |
| parent | 0bd5c4f7c874cf48ff7904dcf8a59988c8fea0e8 (diff) | |
| parent | ee568b25ee9e160b32d1aef73d8b2ee9c05d34db (diff) | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'drivers/media/dvb/frontends/zl10353.h')
| -rw-r--r-- | drivers/media/dvb/frontends/zl10353.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/zl10353.h b/drivers/media/dvb/frontends/zl10353.h index fdbb88ff75fe..2287bac46243 100644 --- a/drivers/media/dvb/frontends/zl10353.h +++ b/drivers/media/dvb/frontends/zl10353.h | |||
| @@ -38,6 +38,9 @@ struct zl10353_config | |||
| 38 | 38 | ||
| 39 | /* set if parallel ts output is required */ | 39 | /* set if parallel ts output is required */ |
| 40 | int parallel_ts; | 40 | int parallel_ts; |
| 41 | |||
| 42 | /* set if i2c_gate_ctrl disable is required */ | ||
| 43 | u8 disable_i2c_gate_ctrl:1; | ||
| 41 | }; | 44 | }; |
| 42 | 45 | ||
| 43 | #if defined(CONFIG_DVB_ZL10353) || (defined(CONFIG_DVB_ZL10353_MODULE) && defined(MODULE)) | 46 | #if defined(CONFIG_DVB_ZL10353) || (defined(CONFIG_DVB_ZL10353_MODULE) && defined(MODULE)) |