diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/dvb/frontends/stv6110x.h | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/dvb/frontends/stv6110x.h')
| -rw-r--r-- | drivers/media/dvb/frontends/stv6110x.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/stv6110x.h b/drivers/media/dvb/frontends/stv6110x.h index a38257080e01..2429ae6d7847 100644 --- a/drivers/media/dvb/frontends/stv6110x.h +++ b/drivers/media/dvb/frontends/stv6110x.h | |||
| @@ -26,6 +26,7 @@ | |||
| 26 | struct stv6110x_config { | 26 | struct stv6110x_config { |
| 27 | u8 addr; | 27 | u8 addr; |
| 28 | u32 refclk; | 28 | u32 refclk; |
| 29 | u8 clk_div; /* divisor value for the output clock */ | ||
| 29 | }; | 30 | }; |
| 30 | 31 | ||
| 31 | enum tuner_mode { | 32 | enum tuner_mode { |