diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:58:50 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-02 15:58:50 -0300 |
| commit | b08432f588a4161f12dd8419a2673ba582c9d3ab (patch) | |
| tree | 4ec2fd257cac5434cf2d3cda154f65d77e5006f1 /linux/drivers/media/dvb/dvb-core | |
| parent | 424e8229ba171eb97b4d366990e3dd17b1eade74 (diff) | |
| parent | ff3f4061e1e6854e0d2c8c52c2363f3d67302651 (diff) | |
| download | mediapointer-dvb-s2-b08432f588a4161f12dd8419a2673ba582c9d3ab.tar.gz mediapointer-dvb-s2-b08432f588a4161f12dd8419a2673ba582c9d3ab.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/pending
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/dvb-core')
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvb_frontend.c | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/dvb-core/dvbdev.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c index 2cad44fb2..90093c965 100644 --- a/linux/drivers/media/dvb/dvb-core/dvb_frontend.c +++ b/linux/drivers/media/dvb/dvb-core/dvb_frontend.c @@ -34,7 +34,6 @@ #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/list.h> -#include "compat.h" #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) #include <linux/suspend.h> #else @@ -46,6 +45,7 @@ #include "dvb_frontend.h" #include "dvbdev.h" +#include "compat.h" static int dvb_frontend_debug; static int dvb_shutdown_timeout = 5; diff --git a/linux/drivers/media/dvb/dvb-core/dvbdev.h b/linux/drivers/media/dvb/dvb-core/dvbdev.h index cb76869bd..6dff10ebf 100644 --- a/linux/drivers/media/dvb/dvb-core/dvbdev.h +++ b/linux/drivers/media/dvb/dvb-core/dvbdev.h @@ -28,7 +28,6 @@ #include <linux/fs.h> #include <linux/list.h> #include <linux/smp_lock.h> -#include "compat.h" #define DVB_MAJOR 212 |