summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/ivtv
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2007-08-29 12:34:43 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-08-29 12:34:43 -0300
commitbb23e654d39bbfdebbf087f9649d1e0e110c5b20 (patch)
tree30898eac94ead8343466ca4714d9871db269595c /linux/drivers/media/video/ivtv
parentf876c2dd29df6aadcb5982273b486a95c2e4b193 (diff)
parent61d260e2d3239aec8f44c91e3b971621bafbbd45 (diff)
downloadmediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.gz
mediapointer-dvb-s2-bb23e654d39bbfdebbf087f9649d1e0e110c5b20.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tuner-refactor-phase-1
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/ivtv')
-rw-r--r--linux/drivers/media/video/ivtv/ivtv-driver.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/video/ivtv/ivtv-driver.h b/linux/drivers/media/video/ivtv/ivtv-driver.h
index 38e52e6a6..592b03fe9 100644
--- a/linux/drivers/media/video/ivtv/ivtv-driver.h
+++ b/linux/drivers/media/video/ivtv/ivtv-driver.h
@@ -65,7 +65,7 @@
#include <media/tuner.h>
#include <media/cx2341x.h>
-#include <media/ivtv.h>
+#include <linux/ivtv.h>
#if 0
#define HAVE_XC2028 1