summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-03-18 09:37:25 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-03-18 09:37:25 -0300
commitbf840a1818e11630aa2cd995cb96fca712d1a314 (patch)
tree0bb2780254d0a13d859fe837531c873a3d65a692 /linux/include/media
parent5d47a3af555cfacf69b0382b1f030635b78fcaac (diff)
parentb711a5c14f67b1d8e43297ddd56fbb1f46720bc6 (diff)
downloadmediapointer-dvb-s2-bf840a1818e11630aa2cd995cb96fca712d1a314.tar.gz
mediapointer-dvb-s2-bf840a1818e11630aa2cd995cb96fca712d1a314.tar.bz2
merge: http://linuxtv.org/hg/~mkrufky/tuner
From: Mauro Carvalho Chehab <mchehab@infradead.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/tuner.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index 1bf24a6ed..77068fcc8 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -78,7 +78,7 @@
#define TUNER_HITACHI_NTSC 40
#define TUNER_PHILIPS_PAL_MK 41
-#define TUNER_PHILIPS_ATSC 42
+#define TUNER_PHILIPS_FCV1236D 42
#define TUNER_PHILIPS_FM1236_MK3 43
#define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */