From 2c4e56b0411f1cd34aceb04f62c2f24452a739d8 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Tue, 25 Dec 2007 20:21:57 -0800 Subject: [PATCH] --- yaml --- r: 75205 b: refs/heads/master c: 11ee29577cc1637f94d903a6ea322cf1ed8ce1b3 h: refs/heads/master i: 75203: b49838ce13910f6180115f612768adcb270903d7 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/smpboot_64.c | 2 +- trunk/drivers/media/video/cx23885/Kconfig | 1 + trunk/drivers/media/video/ivtv/ivtv-i2c.c | 3 +++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ee4a0c3e6c11..45f0ab8e7ae8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: deffca117b90dadec395c0cf3ee816de27dfe2fd +refs/heads/master: 11ee29577cc1637f94d903a6ea322cf1ed8ce1b3 diff --git a/trunk/arch/x86/kernel/smpboot_64.c b/trunk/arch/x86/kernel/smpboot_64.c index 594889521da1..500670c93d81 100644 --- a/trunk/arch/x86/kernel/smpboot_64.c +++ b/trunk/arch/x86/kernel/smpboot_64.c @@ -141,8 +141,8 @@ static void __cpuinit smp_store_cpu_info(int id) struct cpuinfo_x86 *c = &cpu_data(id); *c = boot_cpu_data; - identify_cpu(c); c->cpu_index = id; + identify_cpu(c); print_cpu_info(c); } diff --git a/trunk/drivers/media/video/cx23885/Kconfig b/trunk/drivers/media/video/cx23885/Kconfig index d8b1ccb44913..081ee6e1536f 100644 --- a/trunk/drivers/media/video/cx23885/Kconfig +++ b/trunk/drivers/media/video/cx23885/Kconfig @@ -10,6 +10,7 @@ config VIDEO_CX23885 select VIDEOBUF_DVB select DVB_TUNER_MT2131 if !DVB_FE_CUSTOMISE select DVB_S5H1409 if !DVB_FE_CUSTOMISE + select DVB_LGDT330X if !DVB_FE_CUSTOMISE select DVB_PLL if !DVB_FE_CUSTOMISE ---help--- This is a video4linux driver for Conexant 23885 based diff --git a/trunk/drivers/media/video/ivtv/ivtv-i2c.c b/trunk/drivers/media/video/ivtv/ivtv-i2c.c index 77b27dc750b1..44678fe27a04 100644 --- a/trunk/drivers/media/video/ivtv/ivtv-i2c.c +++ b/trunk/drivers/media/video/ivtv/ivtv-i2c.c @@ -718,6 +718,9 @@ int init_ivtv_i2c(struct ivtv *itv) sizeof(struct i2c_adapter)); memcpy(&itv->i2c_algo, &ivtv_i2c_algo_template, sizeof(struct i2c_algo_bit_data)); + /* The mspx4xx chips need a longer delay for some reason */ + if (itv->hw_flags & IVTV_HW_MSP34XX) + itv->i2c_algo.udelay = 10; itv->i2c_algo.data = itv; itv->i2c_adap.algo_data = &itv->i2c_algo; }