---

yaml --- r: 181237 b: refs/heads/master c: 6b3b557 h: refs/heads/master i: 181235: 3c5f7bb v: v3
git-mirror · Feb 26, 2010 · 673620b · 673620b
1 parent 8c0c885
commit 673620b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2839bd61f671d3debf9ef0893a0470fd97b2e2ce
+refs/heads/master: 6b3b55750b0de4a4ff2742efd34ff74665fa4e2f
diff --git a/trunk/arch/sh/boards/mach-ecovec24/setup.c b/trunk/arch/sh/boards/mach-ecovec24/setup.c
@@ -794,6 +794,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
 	&irda_device,
 };
 
+#ifdef CONFIG_I2C
 #define EEPROM_ADDR 0x50
 static u8 mac_read(struct i2c_adapter *a, u8 command)
 {
@@ -836,6 +837,12 @@ static void __init sh_eth_init(struct sh_eth_plat_data *pd)
 		msleep(10);
 	}
 }
+#else
+static void __init sh_eth_init(struct sh_eth_plat_data *pd)
+{
+	pr_err("unable to read sh_eth MAC address\n");
+}
+#endif
 
 #define PORT_HIZA 0xA4050158
 #define IODRIVEA  0xA405018A