diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-02-10 16:53:29 +0000 |
| commit | b580513e841d81eebf0d7b02f412be0882c2ce5f (patch) | |
| tree | 9336a14058eed66c335db10512f33a31f9e8c938 /drivers/media/video/saa7134/saa7134.h | |
| parent | 04fdabe17c4840a4cd84c3589f20f5d4689b1ec5 (diff) | |
| parent | 418aade459f03318defd18ef0b11981a63bd81b0 (diff) | |
| download | blackbird-op-linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.tar.gz blackbird-op-linux-b580513e841d81eebf0d7b02f412be0882c2ce5f.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
| -rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index e70eae8d29bb..3261d8bebdd1 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h @@ -185,7 +185,7 @@ struct saa7134_format { #define SAA7134_BOARD_AVERMEDIA_GO_007_FM 57 #define SAA7134_BOARD_ADS_INSTANT_TV 58 #define SAA7134_BOARD_KWORLD_VSTREAM_XPERT 59 -#define SAA7134_BOARD_THYPHOON_DVBT_DUO_CARDBUS 60 +#define SAA7134_BOARD_FLYDVBT_DUO_CARDBUS 60 #define SAA7134_BOARD_PHILIPS_TOUGH 61 #define SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII 62 #define SAA7134_BOARD_KWORLD_XPERT 63 |
