summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMagnus Damm <damm@opensource.se>2010-02-25 12:10:54 +0100
committerPaul Mundt <lethal@linux-sh.org>2010-02-26 07:30:08 +0100
commit6b3b55750b0de4a4ff2742efd34ff74665fa4e2f (patch)
treee489bcf779e2e4272d47e6bbde62e02f5d048028
parentsh: ecovec r-standby support (diff)
downloadlinux-6b3b55750b0de4a4ff2742efd34ff74665fa4e2f.tar.xz
linux-6b3b55750b0de4a4ff2742efd34ff74665fa4e2f.zip
sh: ecovec build fix for CONFIG_I2C=n
Allow building the ecovec board support code even though I2C support is disabled. Signed-off-by: Magnus Damm <damm@opensource.se> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/boards/mach-ecovec24/setup.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 3248406ea7ff..39ed8722d11a 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/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