Merge branches 'release', 'cpuidle-2.6.25' and 'idle' into release

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / mv64x60.c

diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 2744b8a6f66aee66daa87d9f97332f54afd2e6f2..90fe904d36141623c5f81f922647b4ac96af171a 100644 (file)
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -411,7 +411,6 @@ static struct mv64xxx_i2c_pdata mv64xxx_i2c_pdata = {
        .freq_m                 = 8,
        .freq_n                 = 3,
        .timeout                = 1000, /* Default timeout of 1 second */
-       .retries                = 1,
 };
 
 static struct resource mv64xxx_i2c_resources[] = {