Merge branch 'mv-merge'

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / powermac / low_i2c.c

diff --git a/arch/powerpc/platforms/powermac/low_i2c.c b/arch/powerpc/platforms/powermac/low_i2c.c
index 535c802b369fbe945dd8de334e86a910aaffb1f4..e14f9ac55cf4b11254c33b3337057932ca3738a7 100644 (file)
--- a/arch/powerpc/platforms/powermac/low_i2c.c
+++ b/arch/powerpc/platforms/powermac/low_i2c.c
@@ -1052,8 +1052,7 @@ struct pmac_i2c_bus *pmac_i2c_adapter_to_bus(struct i2c_adapter *adapter)
 }
 EXPORT_SYMBOL_GPL(pmac_i2c_adapter_to_bus);
 
-extern int pmac_i2c_match_adapter(struct device_node *dev,
-                                 struct i2c_adapter *adapter)
+int pmac_i2c_match_adapter(struct device_node *dev, struct i2c_adapter *adapter)
 {
        struct pmac_i2c_bus *bus = pmac_i2c_find_bus(dev);
 
@@ -1458,6 +1457,9 @@ int __init pmac_i2c_init(void)
                return 0;
        i2c_inited = 1;
 
+       if (!machine_is(powermac))
+               return 0;
+
        /* Probe keywest-i2c busses */
        kw_i2c_probe();