mirror of
https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
synced 2024-10-04 10:50:58 +00:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (7001): av7110: fix section mismatch V4L/DVB (6999): ivtv: stick to udelay=10 after all
This commit is contained in:
commit
d0c4c9d4a2
2 changed files with 5 additions and 9 deletions
|
@ -2800,12 +2800,12 @@ static void av7110_irq(struct saa7146_dev* dev, u32 *isr)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static struct saa7146_extension av7110_extension;
|
static struct saa7146_extension av7110_extension_driver;
|
||||||
|
|
||||||
#define MAKE_AV7110_INFO(x_var,x_name) \
|
#define MAKE_AV7110_INFO(x_var,x_name) \
|
||||||
static struct saa7146_pci_extension_data x_var = { \
|
static struct saa7146_pci_extension_data x_var = { \
|
||||||
.ext_priv = x_name, \
|
.ext_priv = x_name, \
|
||||||
.ext = &av7110_extension }
|
.ext = &av7110_extension_driver }
|
||||||
|
|
||||||
MAKE_AV7110_INFO(tts_1_X_fsc,"Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C");
|
MAKE_AV7110_INFO(tts_1_X_fsc,"Technotrend/Hauppauge WinTV DVB-S rev1.X or Fujitsu Siemens DVB-C");
|
||||||
MAKE_AV7110_INFO(ttt_1_X, "Technotrend/Hauppauge WinTV DVB-T rev1.X");
|
MAKE_AV7110_INFO(ttt_1_X, "Technotrend/Hauppauge WinTV DVB-T rev1.X");
|
||||||
|
@ -2843,7 +2843,7 @@ static struct pci_device_id pci_tbl[] = {
|
||||||
MODULE_DEVICE_TABLE(pci, pci_tbl);
|
MODULE_DEVICE_TABLE(pci, pci_tbl);
|
||||||
|
|
||||||
|
|
||||||
static struct saa7146_extension av7110_extension = {
|
static struct saa7146_extension av7110_extension_driver = {
|
||||||
.name = "dvb",
|
.name = "dvb",
|
||||||
.flags = SAA7146_USE_I2C_IRQ,
|
.flags = SAA7146_USE_I2C_IRQ,
|
||||||
|
|
||||||
|
@ -2860,14 +2860,14 @@ static struct saa7146_extension av7110_extension = {
|
||||||
static int __init av7110_init(void)
|
static int __init av7110_init(void)
|
||||||
{
|
{
|
||||||
int retval;
|
int retval;
|
||||||
retval = saa7146_register_extension(&av7110_extension);
|
retval = saa7146_register_extension(&av7110_extension_driver);
|
||||||
return retval;
|
return retval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static void __exit av7110_exit(void)
|
static void __exit av7110_exit(void)
|
||||||
{
|
{
|
||||||
saa7146_unregister_extension(&av7110_extension);
|
saa7146_unregister_extension(&av7110_extension_driver);
|
||||||
}
|
}
|
||||||
|
|
||||||
module_init(av7110_init);
|
module_init(av7110_init);
|
||||||
|
|
|
@ -1076,10 +1076,6 @@ static int __devinit ivtv_probe(struct pci_dev *dev,
|
||||||
ivtv_process_eeprom(itv);
|
ivtv_process_eeprom(itv);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* The mspx4xx chips need a longer delay for some reason */
|
|
||||||
if (!(itv->hw_flags & IVTV_HW_MSP34XX))
|
|
||||||
itv->i2c_algo.udelay = 5;
|
|
||||||
|
|
||||||
if (itv->std == 0) {
|
if (itv->std == 0) {
|
||||||
itv->std = V4L2_STD_NTSC_M;
|
itv->std = V4L2_STD_NTSC_M;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue