diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 19:23:06 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 19:23:06 -0800 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/dvb/frontends/stv6110x_priv.h | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
| download | talos-obmc-linux-47871889c601d8199c51a4086f77eebd77c29b0b.tar.gz talos-obmc-linux-47871889c601d8199c51a4086f77eebd77c29b0b.zip | |
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_priv.h')
| -rw-r--r-- | drivers/media/dvb/frontends/stv6110x_priv.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/media/dvb/frontends/stv6110x_priv.h b/drivers/media/dvb/frontends/stv6110x_priv.h index 7260da633d49..0ec936a660a7 100644 --- a/drivers/media/dvb/frontends/stv6110x_priv.h +++ b/drivers/media/dvb/frontends/stv6110x_priv.h @@ -68,6 +68,7 @@ struct stv6110x_state { struct i2c_adapter *i2c; const struct stv6110x_config *config; + u8 regs[8]; struct stv6110x_devctl *devctl; }; |
