diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-19 08:45:38 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-03-24 16:26:57 -0300 |
| commit | 49965a80a4c4f5cbe15fb3bb1f8f8b0ec4ef02bc (patch) | |
| tree | aaf7409eb7c44da7527b08d63bdab87e34471fce /drivers | |
| parent | de533ccf8dd51f38ef3c1751f9eb5ad3f2fcfad9 (diff) | |
| download | blackbird-op-linux-49965a80a4c4f5cbe15fb3bb1f8f8b0ec4ef02bc.tar.gz blackbird-op-linux-49965a80a4c4f5cbe15fb3bb1f8f8b0ec4ef02bc.zip | |
V4L/DVB (3581): Add new media/msp3400.h header containing the routing macros
Moved msp3400.h to msp3400-driver.h.
Created media/msp3400.h with the new routing defines and lots of comments.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/msp3400-driver.c | 3 | ||||
| -rw-r--r-- | drivers/media/video/msp3400-driver.h (renamed from drivers/media/video/msp3400.h) | 6 | ||||
| -rw-r--r-- | drivers/media/video/msp3400-kthreads.c | 3 |
4 files changed, 7 insertions, 6 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 4e22fc4889e1..2d68a27417eb 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c @@ -31,7 +31,6 @@ #include <media/audiochip.h> #include <media/tveeprom.h> #include <media/v4l2-common.h> -#include "msp3400.h" #include "em28xx.h" diff --git a/drivers/media/video/msp3400-driver.c b/drivers/media/video/msp3400-driver.c index 9a47ba22c133..04250284ff1e 100644 --- a/drivers/media/video/msp3400-driver.c +++ b/drivers/media/video/msp3400-driver.c @@ -54,9 +54,10 @@ #include <linux/videodev2.h> #include <media/v4l2-common.h> #include <media/tvaudio.h> +#include <media/msp3400.h> #include <linux/kthread.h> #include <linux/suspend.h> -#include "msp3400.h" +#include "msp3400-driver.h" /* ---------------------------------------------------------------------- */ diff --git a/drivers/media/video/msp3400.h b/drivers/media/video/msp3400-driver.h index 25482046fc68..04821ebfe04a 100644 --- a/drivers/media/video/msp3400.h +++ b/drivers/media/video/msp3400-driver.h @@ -1,8 +1,8 @@ /* */ -#ifndef MSP3400_H -#define MSP3400_H +#ifndef MSP3400_DRIVER_H +#define MSP3400_DRIVER_H /* ---------------------------------------------------------------------- */ @@ -110,4 +110,4 @@ int msp34xxg_thread(void *data); void msp3400c_set_mode(struct i2c_client *client, int mode); void msp3400c_set_carrier(struct i2c_client *client, int cdo1, int cdo2); -#endif /* MSP3400_H */ +#endif /* MSP3400_DRIVER_H */ diff --git a/drivers/media/video/msp3400-kthreads.c b/drivers/media/video/msp3400-kthreads.c index 88b216cc49d7..9ee8dc216d7f 100644 --- a/drivers/media/video/msp3400-kthreads.c +++ b/drivers/media/video/msp3400-kthreads.c @@ -26,9 +26,10 @@ #include <linux/videodev.h> #include <linux/videodev2.h> #include <media/v4l2-common.h> +#include <media/msp3400.h> #include <linux/kthread.h> #include <linux/suspend.h> -#include "msp3400.h" +#include "msp3400-driver.h" /* this one uses the automatic sound standard detection of newer msp34xx chip versions */ |
