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/saa7134 | |
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/saa7134')
-rw-r--r-- | drivers/media/video/saa7134/saa6752hs.c | 1 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/media/video/saa7134/saa6752hs.c b/drivers/media/video/saa7134/saa6752hs.c index 2bf5cf79eec1..cdd1ed9c8065 100644 --- a/drivers/media/video/saa7134/saa6752hs.c +++ b/drivers/media/video/saa7134/saa6752hs.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/init.h> | 13 | #include <linux/init.h> |
14 | #include <linux/crc32.h> | 14 | #include <linux/crc32.h> |
15 | 15 | ||
16 | #include <media/id.h> | ||
17 | 16 | ||
18 | #define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 | 17 | #define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 |
19 | #define MPEG_VIDEO_MAX_BITRATE_MAX 27000 | 18 | #define MPEG_VIDEO_MAX_BITRATE_MAX 27000 |
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 1365f1f32fee..4273ded9d174 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -34,7 +34,6 @@ | |||
34 | 34 | ||
35 | #include <media/tuner.h> | 35 | #include <media/tuner.h> |
36 | #include <media/audiochip.h> | 36 | #include <media/audiochip.h> |
37 | #include <media/id.h> | ||
38 | #include <media/ir-common.h> | 37 | #include <media/ir-common.h> |
39 | #include <media/ir-kbd-i2c.h> | 38 | #include <media/ir-kbd-i2c.h> |
40 | #include <media/video-buf.h> | 39 | #include <media/video-buf.h> |