diff options
author | Jean Delvare <khali@linux-fr.org> | 2005-11-09 00:38:26 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-09 10:56:27 -0500 |
commit | e0ec29b7e5aa1f4f1ff73ebd3003336dbe83e174 (patch) | |
tree | de32e4c362a18c62b6a34b0ca690d15fd92dd071 /drivers/media/video/tvaudio.c | |
parent | 710a72589a6727973405fd3580d7c724ba709296 (diff) |
[PATCH] v4l: 885: second round of i2c ids redefinition cleanup
- Second round of i2c IDs redefinition cleanup.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/tvaudio.c')
-rw-r--r-- | drivers/media/video/tvaudio.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c index 75901b030730..c31bf28b73fe 100644 --- a/drivers/media/video/tvaudio.c +++ b/drivers/media/video/tvaudio.c | |||
@@ -31,7 +31,6 @@ | |||
31 | #include <linux/smp_lock.h> | 31 | #include <linux/smp_lock.h> |
32 | 32 | ||
33 | #include <media/audiochip.h> | 33 | #include <media/audiochip.h> |
34 | #include <media/id.h> | ||
35 | 34 | ||
36 | #include "tvaudio.h" | 35 | #include "tvaudio.h" |
37 | 36 | ||
@@ -1438,7 +1437,7 @@ static struct CHIPDESC chiplist[] = { | |||
1438 | }, | 1437 | }, |
1439 | { | 1438 | { |
1440 | .name = "pic16c54 (PV951)", | 1439 | .name = "pic16c54 (PV951)", |
1441 | .id = I2C_DRIVERID_PIC16C54_PV951, | 1440 | .id = I2C_DRIVERID_PIC16C54_PV9, |
1442 | .insmodopt = &pic16c54, | 1441 | .insmodopt = &pic16c54, |
1443 | .addr_lo = I2C_PIC16C54 >> 1, | 1442 | .addr_lo = I2C_PIC16C54 >> 1, |
1444 | .addr_hi = I2C_PIC16C54>> 1, | 1443 | .addr_hi = I2C_PIC16C54>> 1, |