summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134.h
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-08-06 07:50:50 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-08-06 07:50:50 -0300
commitfa78f832b219585b0c8df60fa718e52ae8212bdd (patch)
tree0df6d1f161db342e30b3adc6d724a6e4736b9760 /linux/drivers/media/video/saa7134/saa7134.h
parentaa7df40721e36bcf9d4f1a60b9e58e69c08aac48 (diff)
parent8b5e9c7eff25fa9a8405ab96c815109f6e2eb059 (diff)
downloadmediapointer-dvb-s2-fa78f832b219585b0c8df60fa718e52ae8212bdd.tar.gz
mediapointer-dvb-s2-fa78f832b219585b0c8df60fa718e52ae8212bdd.tar.bz2
merge: http://www.kernellabs.com/hg/~dheitmueller/geniatech_x8000
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134.h')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h
index be5abf059..6b0742ad7 100644
--- a/linux/drivers/media/video/saa7134/saa7134.h
+++ b/linux/drivers/media/video/saa7134/saa7134.h
@@ -279,8 +279,8 @@ struct saa7134_format {
#define SAA7134_BOARD_ASUSTeK_TIGER 152
#define SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG 153
#define SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS 154
-#define SAA7134_BOARD_HAUPPAUGE_HVR1120 155
-#define SAA7134_BOARD_HAUPPAUGE_HVR1110R3 156
+#define SAA7134_BOARD_HAUPPAUGE_HVR1150 155
+#define SAA7134_BOARD_HAUPPAUGE_HVR1120 156
#define SAA7134_BOARD_AVERMEDIA_STUDIO_507UA 157
#define SAA7134_BOARD_AVERMEDIA_CARDBUS_501 158
#define SAA7134_BOARD_BEHOLD_505RDS 159