[PATCH] v4l: 711: changed pll 1 to pll pll 28
- Changed { .pll = 1, } to { .pll = PLL_28, }
Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff --git a/drivers/media/video/bttv.h b/drivers/media/video/bttv.h
index 75d08a3..ffece3b 100644
--- a/drivers/media/video/bttv.h
+++ b/drivers/media/video/bttv.h
@@ -20,147 +20,147 @@
/* ---------------------------------------------------------- */
/* exported by bttv-cards.c */
-#define BTTV_BOARD_UNKNOWN 0x00
-#define BTTV_BOARD_MIRO 0x01
-#define BTTV_BOARD_HAUPPAUGE 0x02
-#define BTTV_BOARD_STB 0x03
-#define BTTV_BOARD_INTEL 0x04
-#define BTTV_BOARD_DIAMOND 0x05
-#define BTTV_BOARD_AVERMEDIA 0x06
-#define BTTV_BOARD_MATRIX_VISION 0x07
-#define BTTV_BOARD_FLYVIDEO 0x08
-#define BTTV_BOARD_TURBOTV 0x09
-#define BTTV_BOARD_HAUPPAUGE878 0x0a
-#define BTTV_BOARD_MIROPRO 0x0b
-#define BTTV_BOARD_ADSTECH_TV 0x0c
-#define BTTV_BOARD_AVERMEDIA98 0x0d
-#define BTTV_BOARD_VHX 0x0e
-#define BTTV_BOARD_ZOLTRIX 0x0f
-#define BTTV_BOARD_PIXVIEWPLAYTV 0x10
-#define BTTV_BOARD_WINVIEW_601 0x11
-#define BTTV_BOARD_AVEC_INTERCAP 0x12
-#define BTTV_BOARD_LIFE_FLYKIT 0x13
-#define BTTV_BOARD_CEI_RAFFLES 0x14
-#define BTTV_BOARD_CONFERENCETV 0x15
-#define BTTV_BOARD_PHOEBE_TVMAS 0x16
-#define BTTV_BOARD_MODTEC_205 0x17
-#define BTTV_BOARD_MAGICTVIEW061 0x18
-#define BTTV_BOARD_VOBIS_BOOSTAR 0x19
-#define BTTV_BOARD_HAUPPAUG_WCAM 0x1a
-#define BTTV_BOARD_MAXI 0x1b
-#define BTTV_BOARD_TERRATV 0x1c
-#define BTTV_BOARD_PXC200 0x1d
-#define BTTV_BOARD_FLYVIDEO_98 0x1e
-#define BTTV_BOARD_IPROTV 0x1f
-#define BTTV_BOARD_INTEL_C_S_PCI 0x20
-#define BTTV_BOARD_TERRATVALUE 0x21
-#define BTTV_BOARD_WINFAST2000 0x22
-#define BTTV_BOARD_CHRONOS_VS2 0x23
-#define BTTV_BOARD_TYPHOON_TVIEW 0x24
-#define BTTV_BOARD_PXELVWPLTVPRO 0x25
-#define BTTV_BOARD_MAGICTVIEW063 0x26
-#define BTTV_BOARD_PINNACLE 0x27
-#define BTTV_BOARD_STB2 0x28
-#define BTTV_BOARD_AVPHONE98 0x29
-#define BTTV_BOARD_PV951 0x2a
-#define BTTV_BOARD_ONAIR_TV 0x2b
-#define BTTV_BOARD_SIGMA_TVII_FM 0x2c
-#define BTTV_BOARD_MATRIX_VISION2 0x2d
-#define BTTV_BOARD_ZOLTRIX_GENIE 0x2e
-#define BTTV_BOARD_TERRATVRADIO 0x2f
-#define BTTV_BOARD_DYNALINK 0x30
-#define BTTV_BOARD_GVBCTV3PCI 0x31
-#define BTTV_BOARD_PXELVWPLTVPAK 0x32
-#define BTTV_BOARD_EAGLE 0x33
-#define BTTV_BOARD_PINNACLEPRO 0x34
-#define BTTV_BOARD_TVIEW_RDS_FM 0x35
-#define BTTV_BOARD_LIFETEC_9415 0x36
-#define BTTV_BOARD_BESTBUY_EASYTV 0x37
-#define BTTV_BOARD_FLYVIDEO_98FM 0x38
-#define BTTV_BOARD_GRANDTEC 0x39
-#define BTTV_BOARD_ASKEY_CPH060 0x3a
-#define BTTV_BOARD_ASKEY_CPH03X 0x3b
-#define BTTV_BOARD_MM100PCTV 0x3c
-#define BTTV_BOARD_GMV1 0x3d
-#define BTTV_BOARD_BESTBUY_EASYTV2 0x3e
-#define BTTV_BOARD_ATI_TVWONDER 0x3f
-#define BTTV_BOARD_ATI_TVWONDERVE 0x40
-#define BTTV_BOARD_FLYVIDEO2000 0x41
-#define BTTV_BOARD_TERRATVALUER 0x42
-#define BTTV_BOARD_GVBCTV4PCI 0x43
-#define BTTV_BOARD_VOODOOTV_FM 0x44
-#define BTTV_BOARD_AIMMS 0x45
-#define BTTV_BOARD_PV_BT878P_PLUS 0x46
-#define BTTV_BOARD_FLYVIDEO98EZ 0x47
-#define BTTV_BOARD_PV_BT878P_9B 0x48
-#define BTTV_BOARD_SENSORAY311 0x49
-#define BTTV_BOARD_RV605 0x4a
-#define BTTV_BOARD_POWERCLR_MTV878 0x4b
-#define BTTV_BOARD_WINDVR 0x4c
-#define BTTV_BOARD_GRANDTEC_MULTI 0x4d
-#define BTTV_BOARD_KWORLD 0x4e
-#define BTTV_BOARD_DSP_TCVIDEO 0x4f
-#define BTTV_BOARD_HAUPPAUGEPVR 0x50
-#define BTTV_BOARD_GVBCTV5PCI 0x51
-#define BTTV_BOARD_OSPREY1x0 0x52
-#define BTTV_BOARD_OSPREY1x0_848 0x53
-#define BTTV_BOARD_OSPREY101_848 0x54
-#define BTTV_BOARD_OSPREY1x1 0x55
-#define BTTV_BOARD_OSPREY1x1_SVID 0x56
-#define BTTV_BOARD_OSPREY2xx 0x57
-#define BTTV_BOARD_OSPREY2x0_SVID 0x58
-#define BTTV_BOARD_OSPREY2x0 0x59
-#define BTTV_BOARD_OSPREY500 0x5a
-#define BTTV_BOARD_OSPREY540 0x5b
-#define BTTV_BOARD_OSPREY2000 0x5c
-#define BTTV_BOARD_IDS_EAGLE 0x5d
-#define BTTV_BOARD_PINNACLESAT 0x5e
-#define BTTV_BOARD_FORMAC_PROTV 0x5f
-#define BTTV_BOARD_MACHTV 0x60
-#define BTTV_BOARD_EURESYS_PICOLO 0x61
-#define BTTV_BOARD_PV150 0x62
-#define BTTV_BOARD_AD_TVK503 0x63
-#define BTTV_BOARD_HERCULES_SM_TV 0x64
-#define BTTV_BOARD_PACETV 0x65
-#define BTTV_BOARD_IVC200 0x66
-#define BTTV_BOARD_XGUARD 0x67
-#define BTTV_BOARD_NEBULA_DIGITV 0x68
-#define BTTV_BOARD_PV143 0x69
-#define BTTV_BOARD_VD009X1_MINIDIN 0x6a
-#define BTTV_BOARD_VD009X1_COMBI 0x6b
-#define BTTV_BOARD_VD009_MINIDIN 0x6c
-#define BTTV_BOARD_VD009_COMBI 0x6d
-#define BTTV_BOARD_IVC100 0x6e
-#define BTTV_BOARD_IVC120 0x6f
-#define BTTV_BOARD_PC_HDTV 0x70
-#define BTTV_BOARD_TWINHAN_DST 0x71
-#define BTTV_BOARD_WINFASTVC100 0x72
-#define BTTV_BOARD_TEV560 0x73
-#define BTTV_BOARD_SIMUS_GVC1100 0x74
-#define BTTV_BOARD_NGSTV_PLUS 0x75
-#define BTTV_BOARD_LMLBT4 0x76
-#define BTTV_BOARD_TEKRAM_M205 0x77
-#define BTTV_BOARD_CONTVFMI 0x78
-#define BTTV_BOARD_PICOLO_TETRA_CHIP 0x79
-#define BTTV_BOARD_SPIRIT_TV 0x7a
-#define BTTV_BOARD_AVDVBT_771 0x7b
-#define BTTV_BOARD_AVDVBT_761 0x7c
-#define BTTV_BOARD_MATRIX_VISIONSQ 0x7d
-#define BTTV_BOARD_MATRIX_VISIONSLC 0x7e
-#define BTTV_BOARD_APAC_VIEWCOMP 0x7f
-#define BTTV_BOARD_DVICO_DVBT_LITE 0x80
-#define BTTV_BOARD_VGEAR_MYVCD 0x81
-#define BTTV_BOARD_SUPER_TV 0x82
-#define BTTV_BOARD_TIBET_CS16 0x83
-#define BTTV_BOARD_KODICOM_4400R 0x84
-#define BTTV_BOARD_KODICOM_4400R_SL 0x85
-#define BTTV_BOARD_ADLINK_RTV24 0x86
+#define BTTV_BOARD_UNKNOWN 0x00
+#define BTTV_BOARD_MIRO 0x01
+#define BTTV_BOARD_HAUPPAUGE 0x02
+#define BTTV_BOARD_STB 0x03
+#define BTTV_BOARD_INTEL 0x04
+#define BTTV_BOARD_DIAMOND 0x05
+#define BTTV_BOARD_AVERMEDIA 0x06
+#define BTTV_BOARD_MATRIX_VISION 0x07
+#define BTTV_BOARD_FLYVIDEO 0x08
+#define BTTV_BOARD_TURBOTV 0x09
+#define BTTV_BOARD_HAUPPAUGE878 0x0a
+#define BTTV_BOARD_MIROPRO 0x0b
+#define BTTV_BOARD_ADSTECH_TV 0x0c
+#define BTTV_BOARD_AVERMEDIA98 0x0d
+#define BTTV_BOARD_VHX 0x0e
+#define BTTV_BOARD_ZOLTRIX 0x0f
+#define BTTV_BOARD_PIXVIEWPLAYTV 0x10
+#define BTTV_BOARD_WINVIEW_601 0x11
+#define BTTV_BOARD_AVEC_INTERCAP 0x12
+#define BTTV_BOARD_LIFE_FLYKIT 0x13
+#define BTTV_BOARD_CEI_RAFFLES 0x14
+#define BTTV_BOARD_CONFERENCETV 0x15
+#define BTTV_BOARD_PHOEBE_TVMAS 0x16
+#define BTTV_BOARD_MODTEC_205 0x17
+#define BTTV_BOARD_MAGICTVIEW061 0x18
+#define BTTV_BOARD_VOBIS_BOOSTAR 0x19
+#define BTTV_BOARD_HAUPPAUG_WCAM 0x1a
+#define BTTV_BOARD_MAXI 0x1b
+#define BTTV_BOARD_TERRATV 0x1c
+#define BTTV_BOARD_PXC200 0x1d
+#define BTTV_BOARD_FLYVIDEO_98 0x1e
+#define BTTV_BOARD_IPROTV 0x1f
+#define BTTV_BOARD_INTEL_C_S_PCI 0x20
+#define BTTV_BOARD_TERRATVALUE 0x21
+#define BTTV_BOARD_WINFAST2000 0x22
+#define BTTV_BOARD_CHRONOS_VS2 0x23
+#define BTTV_BOARD_TYPHOON_TVIEW 0x24
+#define BTTV_BOARD_PXELVWPLTVPRO 0x25
+#define BTTV_BOARD_MAGICTVIEW063 0x26
+#define BTTV_BOARD_PINNACLE 0x27
+#define BTTV_BOARD_STB2 0x28
+#define BTTV_BOARD_AVPHONE98 0x29
+#define BTTV_BOARD_PV951 0x2a
+#define BTTV_BOARD_ONAIR_TV 0x2b
+#define BTTV_BOARD_SIGMA_TVII_FM 0x2c
+#define BTTV_BOARD_MATRIX_VISION2 0x2d
+#define BTTV_BOARD_ZOLTRIX_GENIE 0x2e
+#define BTTV_BOARD_TERRATVRADIO 0x2f
+#define BTTV_BOARD_DYNALINK 0x30
+#define BTTV_BOARD_GVBCTV3PCI 0x31
+#define BTTV_BOARD_PXELVWPLTVPAK 0x32
+#define BTTV_BOARD_EAGLE 0x33
+#define BTTV_BOARD_PINNACLEPRO 0x34
+#define BTTV_BOARD_TVIEW_RDS_FM 0x35
+#define BTTV_BOARD_LIFETEC_9415 0x36
+#define BTTV_BOARD_BESTBUY_EASYTV 0x37
+#define BTTV_BOARD_FLYVIDEO_98FM 0x38
+#define BTTV_BOARD_GRANDTEC 0x39
+#define BTTV_BOARD_ASKEY_CPH060 0x3a
+#define BTTV_BOARD_ASKEY_CPH03X 0x3b
+#define BTTV_BOARD_MM100PCTV 0x3c
+#define BTTV_BOARD_GMV1 0x3d
+#define BTTV_BOARD_BESTBUY_EASYTV2 0x3e
+#define BTTV_BOARD_ATI_TVWONDER 0x3f
+#define BTTV_BOARD_ATI_TVWONDERVE 0x40
+#define BTTV_BOARD_FLYVIDEO2000 0x41
+#define BTTV_BOARD_TERRATVALUER 0x42
+#define BTTV_BOARD_GVBCTV4PCI 0x43
+#define BTTV_BOARD_VOODOOTV_FM 0x44
+#define BTTV_BOARD_AIMMS 0x45
+#define BTTV_BOARD_PV_BT878P_PLUS 0x46
+#define BTTV_BOARD_FLYVIDEO98EZ 0x47
+#define BTTV_BOARD_PV_BT878P_9B 0x48
+#define BTTV_BOARD_SENSORAY311 0x49
+#define BTTV_BOARD_RV605 0x4a
+#define BTTV_BOARD_POWERCLR_MTV878 0x4b
+#define BTTV_BOARD_WINDVR 0x4c
+#define BTTV_BOARD_GRANDTEC_MULTI 0x4d
+#define BTTV_BOARD_KWORLD 0x4e
+#define BTTV_BOARD_DSP_TCVIDEO 0x4f
+#define BTTV_BOARD_HAUPPAUGEPVR 0x50
+#define BTTV_BOARD_GVBCTV5PCI 0x51
+#define BTTV_BOARD_OSPREY1x0 0x52
+#define BTTV_BOARD_OSPREY1x0_848 0x53
+#define BTTV_BOARD_OSPREY101_848 0x54
+#define BTTV_BOARD_OSPREY1x1 0x55
+#define BTTV_BOARD_OSPREY1x1_SVID 0x56
+#define BTTV_BOARD_OSPREY2xx 0x57
+#define BTTV_BOARD_OSPREY2x0_SVID 0x58
+#define BTTV_BOARD_OSPREY2x0 0x59
+#define BTTV_BOARD_OSPREY500 0x5a
+#define BTTV_BOARD_OSPREY540 0x5b
+#define BTTV_BOARD_OSPREY2000 0x5c
+#define BTTV_BOARD_IDS_EAGLE 0x5d
+#define BTTV_BOARD_PINNACLESAT 0x5e
+#define BTTV_BOARD_FORMAC_PROTV 0x5f
+#define BTTV_BOARD_MACHTV 0x60
+#define BTTV_BOARD_EURESYS_PICOLO 0x61
+#define BTTV_BOARD_PV150 0x62
+#define BTTV_BOARD_AD_TVK503 0x63
+#define BTTV_BOARD_HERCULES_SM_TV 0x64
+#define BTTV_BOARD_PACETV 0x65
+#define BTTV_BOARD_IVC200 0x66
+#define BTTV_BOARD_XGUARD 0x67
+#define BTTV_BOARD_NEBULA_DIGITV 0x68
+#define BTTV_BOARD_PV143 0x69
+#define BTTV_BOARD_VD009X1_MINIDIN 0x6a
+#define BTTV_BOARD_VD009X1_COMBI 0x6b
+#define BTTV_BOARD_VD009_MINIDIN 0x6c
+#define BTTV_BOARD_VD009_COMBI 0x6d
+#define BTTV_BOARD_IVC100 0x6e
+#define BTTV_BOARD_IVC120 0x6f
+#define BTTV_BOARD_PC_HDTV 0x70
+#define BTTV_BOARD_TWINHAN_DST 0x71
+#define BTTV_BOARD_WINFASTVC100 0x72
+#define BTTV_BOARD_TEV560 0x73
+#define BTTV_BOARD_SIMUS_GVC1100 0x74
+#define BTTV_BOARD_NGSTV_PLUS 0x75
+#define BTTV_BOARD_LMLBT4 0x76
+#define BTTV_BOARD_TEKRAM_M205 0x77
+#define BTTV_BOARD_CONTVFMI 0x78
+#define BTTV_BOARD_PICOLO_TETRA_CHIP 0x79
+#define BTTV_BOARD_SPIRIT_TV 0x7a
+#define BTTV_BOARD_AVDVBT_771 0x7b
+#define BTTV_BOARD_AVDVBT_761 0x7c
+#define BTTV_BOARD_MATRIX_VISIONSQ 0x7d
+#define BTTV_BOARD_MATRIX_VISIONSLC 0x7e
+#define BTTV_BOARD_APAC_VIEWCOMP 0x7f
+#define BTTV_BOARD_DVICO_DVBT_LITE 0x80
+#define BTTV_BOARD_VGEAR_MYVCD 0x81
+#define BTTV_BOARD_SUPER_TV 0x82
+#define BTTV_BOARD_TIBET_CS16 0x83
+#define BTTV_BOARD_KODICOM_4400R 0x84
+#define BTTV_BOARD_KODICOM_4400R_SL 0x85
+#define BTTV_BOARD_ADLINK_RTV24 0x86
#define BTTV_BOARD_DVICO_FUSIONHDTV_5_LITE 0x87
-#define BTTV_BOARD_ACORP_Y878F 0x88
-#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89
-#define BTTV_BOARD_PV_BT878P_2E 0x8a
-#define BTTV_BOARD_PV_M4900 0x8b
-#define BTTV_BOARD_OSPREY440 0x8c
+#define BTTV_BOARD_ACORP_Y878F 0x88
+#define BTTV_BOARD_CONCEPTRONIC_CTVFMI2 0x89
+#define BTTV_BOARD_PV_BT878P_2E 0x8a
+#define BTTV_BOARD_PV_M4900 0x8b
+#define BTTV_BOARD_OSPREY440 0x8c
/* i2c address list */
#define I2C_TSA5522 0xc2