From 6e5dc0d5aee59099740acf14df332bee2cd075dd Mon Sep 17 00:00:00 2001 From: Florian Tobias Schandinat Date: Sun, 19 Feb 2012 01:23:20 +0000 Subject: [PATCH] --- yaml --- r: 294288 b: refs/heads/master c: 78145b7a343fe2950478e649e905f557054df884 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/video/via/viafbdev.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 38186658a823..f9eb5101c95c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c572c8bbff13591f6c9f249d4413f79ddda21e61 +refs/heads/master: 78145b7a343fe2950478e649e905f557054df884 diff --git a/trunk/drivers/video/via/viafbdev.c b/trunk/drivers/video/via/viafbdev.c index 47911658f684..9cfa92ef6bd0 100644 --- a/trunk/drivers/video/via/viafbdev.c +++ b/trunk/drivers/video/via/viafbdev.c @@ -1752,8 +1752,10 @@ static void __devinit i2c_bus_probe(struct viafb_shared *shared) shared->i2c_31 = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_31)); /* FIXME: what is this? */ - printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); - shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); + if (!machine_is_olpc()) { + printk(KERN_INFO "viafb: Probing I2C bus 0x2C\n"); + shared->i2c_2C = via_aux_probe(viafb_find_i2c_adapter(VIA_PORT_2C)); + } printk(KERN_INFO "viafb: Finished I2C bus probing"); }