diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:49:04 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-14 18:51:11 -0400 |
| commit | 751851af7aae9b8bd5a60b3897209081fbc18b2b (patch) | |
| tree | 5cb8dbb71d691a760da61e319796800ee42cc1c5 /drivers/media/dvb/frontends/tda10048.c | |
| parent | a41eebab7537890409ea9dfe0fcda9b5fbdb090d (diff) | |
| parent | d71792ac3d48df6693f7b339e02494efc27036c3 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Conflicts:
sound/pci/Kconfig
Diffstat (limited to 'drivers/media/dvb/frontends/tda10048.c')
| -rw-r--r-- | drivers/media/dvb/frontends/tda10048.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/dvb/frontends/tda10048.c b/drivers/media/dvb/frontends/tda10048.c index 090fb7dd93c6..0ab8d86b3ae3 100644 --- a/drivers/media/dvb/frontends/tda10048.c +++ b/drivers/media/dvb/frontends/tda10048.c | |||
| @@ -233,7 +233,7 @@ static u8 tda10048_readreg(struct tda10048_state *state, u8 reg) | |||
| 233 | } | 233 | } |
| 234 | 234 | ||
| 235 | static int tda10048_writeregbulk(struct tda10048_state *state, u8 reg, | 235 | static int tda10048_writeregbulk(struct tda10048_state *state, u8 reg, |
| 236 | u8 *data, u16 len) | 236 | const u8 *data, u16 len) |
| 237 | { | 237 | { |
| 238 | int ret = -EREMOTEIO; | 238 | int ret = -EREMOTEIO; |
| 239 | struct i2c_msg msg; | 239 | struct i2c_msg msg; |