diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:30:08 -0400 |
| commit | 3dd392a407d15250a501fa109cc1f93fee95ef85 (patch) | |
| tree | c1faca3fa8bd0f7c8790b3e0887229b4a5a90e8b /drivers/media/dvb/frontends/s5h1420.h | |
| parent | b27a43c1e90582facad44de67d02bc9e9f900289 (diff) | |
| parent | d403a6484f0341bf0624d17ece46f24f741b6a92 (diff) | |
Merge branch 'linus' into x86/pat2
Conflicts:
arch/x86/mm/init_64.c
Diffstat (limited to 'drivers/media/dvb/frontends/s5h1420.h')
| -rw-r--r-- | drivers/media/dvb/frontends/s5h1420.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/frontends/s5h1420.h b/drivers/media/dvb/frontends/s5h1420.h index 4c913f142bc4..ff308136d865 100644 --- a/drivers/media/dvb/frontends/s5h1420.h +++ b/drivers/media/dvb/frontends/s5h1420.h | |||
| @@ -32,10 +32,12 @@ struct s5h1420_config | |||
| 32 | u8 demod_address; | 32 | u8 demod_address; |
| 33 | 33 | ||
| 34 | /* does the inversion require inversion? */ | 34 | /* does the inversion require inversion? */ |
| 35 | u8 invert : 1; | 35 | u8 invert:1; |
| 36 | 36 | ||
| 37 | u8 repeated_start_workaround : 1; | 37 | u8 repeated_start_workaround:1; |
| 38 | u8 cdclk_polarity : 1; /* 1 == falling edge, 0 == raising edge */ | 38 | u8 cdclk_polarity:1; /* 1 == falling edge, 0 == raising edge */ |
| 39 | |||
| 40 | u8 serial_mpeg:1; | ||
| 39 | }; | 41 | }; |
| 40 | 42 | ||
| 41 | #if defined(CONFIG_DVB_S5H1420) || (defined(CONFIG_DVB_S5H1420_MODULE) && defined(MODULE)) | 43 | #if defined(CONFIG_DVB_S5H1420) || (defined(CONFIG_DVB_S5H1420_MODULE) && defined(MODULE)) |