diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
| commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
| tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/media/tveeprom.h | |
| parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
| parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) | |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/media/tveeprom.h')
| -rw-r--r-- | include/media/tveeprom.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/media/tveeprom.h b/include/media/tveeprom.h index 5c4fe30e8d1d..854a2c2f105b 100644 --- a/include/media/tveeprom.h +++ b/include/media/tveeprom.h | |||
| @@ -24,4 +24,3 @@ void tveeprom_hauppauge_analog(struct tveeprom *tvee, | |||
| 24 | unsigned char *eeprom_data); | 24 | unsigned char *eeprom_data); |
| 25 | 25 | ||
| 26 | int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len); | 26 | int tveeprom_read(struct i2c_client *c, unsigned char *eedata, int len); |
| 27 | int tveeprom_dump(unsigned char *eedata, int len); | ||