diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-26 12:39:02 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-26 12:39:02 +0200 |
| commit | 72f5824b3f52fedf99d70a834d9be2a10ee318c6 (patch) | |
| tree | 6ff5926046a63813899eea2ae7fc20565d92b051 /linux/drivers/media/common | |
| parent | 350bbc5926746c35a38095da02fa7e82d67cca22 (diff) | |
| parent | ddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (diff) | |
| download | mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.gz mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/tuners/tda9887.c | 4 | ||||
| -rw-r--r-- | linux/drivers/media/common/tuners/tuner-simple.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/linux/drivers/media/common/tuners/tda9887.c b/linux/drivers/media/common/tuners/tda9887.c index 61a56026d..d588c5d88 100644 --- a/linux/drivers/media/common/tuners/tda9887.c +++ b/linux/drivers/media/common/tuners/tda9887.c @@ -6,12 +6,12 @@ #include <linux/errno.h> #include <linux/slab.h> #include <linux/delay.h> -#include "compat.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/v4l2-common.h> #include <media/tuner.h> #include "tuner-i2c.h" #include "tda9887.h" +#include "compat.h" /* Chips: diff --git a/linux/drivers/media/common/tuners/tuner-simple.c b/linux/drivers/media/common/tuners/tuner-simple.c index a029cf8f5..f352af87b 100644 --- a/linux/drivers/media/common/tuners/tuner-simple.c +++ b/linux/drivers/media/common/tuners/tuner-simple.c @@ -7,7 +7,7 @@ #include <linux/delay.h> #include <linux/i2c.h> #include "compat.h" -#include <linux/videodev.h> +#include <linux/videodev2.h> #include <media/tuner.h> #include <media/v4l2-common.h> #include <media/tuner-types.h> |