summaryrefslogtreecommitdiff
path: root/linux/include
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:26:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-09-17 10:26:50 -0300
commitf430c6a8909c2ec0e7802b492b2b75b85fe5f04e (patch)
treee6ad037cb199a3607affcf9fc158085be8bd50f9 /linux/include
parent307405f21d709dd8df9a479d1786d7a2697f1796 (diff)
parent216737d4199ef875a6a09256d760d09b4442f75a (diff)
downloadmediapointer-dvb-s2-f430c6a8909c2ec0e7802b492b2b75b85fe5f04e.tar.gz
mediapointer-dvb-s2-f430c6a8909c2ec0e7802b492b2b75b85fe5f04e.tar.bz2
merge: http://linuxtv.org/hg/~anttip/ce6230/
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
-rw-r--r--linux/include/linux/i2c-id.h1
-rw-r--r--linux/include/media/tuner.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/linux/include/linux/i2c-id.h b/linux/include/linux/i2c-id.h
index c9087de5c..271b67a31 100644
--- a/linux/include/linux/i2c-id.h
+++ b/linux/include/linux/i2c-id.h
@@ -53,6 +53,7 @@
#define I2C_HW_B_AU0828 0x010023 /* auvitek au0828 usb bridge */
#define I2C_HW_B_CX231XX 0x010024 /* Conexant CX231XX USB based cards */
#define I2C_HW_B_HDPVR 0x010025 /* Hauppauge HD PVR */
+#define I2C_HW_B_SAA7164 0x010024 /* NXP 7164 based tv cards */
/* --- SGI adapters */
#define I2C_HW_SGI_VINO 0x160000
diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h
index c146f2f53..b1f57e175 100644
--- a/linux/include/media/tuner.h
+++ b/linux/include/media/tuner.h
@@ -127,6 +127,7 @@
#define TUNER_PHILIPS_FM1216MK5 79
#define TUNER_PHILIPS_FQ1216LME_MK3 80 /* Active loopthrough, no FM */
#define TUNER_PARTSNIC_PTI_5NF05 81
+#define TUNER_PHILIPS_CU1216L 82
/* tv card specific */
#define TDA9887_PRESENT (1<<0)