diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 10:30:04 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-22 10:30:04 -0300 |
commit | 4a78e983d25641804f5c0c83b6c10e51063b7872 (patch) | |
tree | ce0631476907751234d1d60ee9d1f72e18b30de2 /linux/drivers/media/dvb/cinergyT2 | |
parent | 2a03de082a1ec685712a48cedb06a73d5d607088 (diff) | |
parent | 126b42f75f3d60cf024d206f8d7fb8680903cf8a (diff) | |
download | mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.gz mediapointer-dvb-s2-4a78e983d25641804f5c0c83b6c10e51063b7872.tar.bz2 |
merge: http://linuxtv.org/hg/~aapot/m920x
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/dvb/cinergyT2')
-rw-r--r-- | linux/drivers/media/dvb/cinergyT2/cinergyT2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c index 4b092d7c2..68796cd8e 100644 --- a/linux/drivers/media/dvb/cinergyT2/cinergyT2.c +++ b/linux/drivers/media/dvb/cinergyT2/cinergyT2.c @@ -26,7 +26,6 @@ #include <linux/module.h> #include <linux/slab.h> #include <linux/usb.h> -#include <linux/pci.h> #include <linux/input.h> #include <linux/dvb/frontend.h> #include "compat.h" @@ -34,6 +33,7 @@ #include <linux/mutex.h> #endif #include <linux/mm.h> +#include <asm/io.h> #include "dmxdev.h" #include "dvb_demux.h" |