diff options
author | Tony Lindgren <tony@atomide.com> | 2009-06-17 06:20:21 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2009-06-21 20:43:32 -0400 |
commit | ff0f242626313f3544254cb882039794b7b70e4b (patch) | |
tree | 057046873dfd9a5238a3b04839946adae0754198 /drivers/i2c/busses/i2c-omap.c | |
parent | f234012f52a37e48f2330e1ca2df69800e797c3b (diff) |
i2c-omap: Fix build breaking typo cpu_is_omap_2430
Hi Ben,
Can you please queue this fix?
Thanks,
Tony
>From ffe2b2cdf6283770b70a197e3748c6b40a1006be Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 17 Jun 2009 13:14:23 +0300
Subject: [PATCH] i2c-omap: Fix build breaking typo in cpu_is_omap_2430
Commit 84bf2c86 introduced a typo, it should be cpu_is_omap2430
instead. The typo was probably caused by a mismerge.
Without this patch all omaps fail to build with:
error: implicit declaration of function 'cpu_is_omap_2430'
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'drivers/i2c/busses/i2c-omap.c')
-rw-r--r-- | drivers/i2c/busses/i2c-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c index b606db85525d..ad8d2010c921 100644 --- a/drivers/i2c/busses/i2c-omap.c +++ b/drivers/i2c/busses/i2c-omap.c | |||
@@ -339,7 +339,7 @@ static int omap_i2c_init(struct omap_i2c_dev *dev) | |||
339 | * to get longer filter period for better noise suppression. | 339 | * to get longer filter period for better noise suppression. |
340 | * The filter is iclk (fclk for HS) period. | 340 | * The filter is iclk (fclk for HS) period. |
341 | */ | 341 | */ |
342 | if (dev->speed > 400 || cpu_is_omap_2430()) | 342 | if (dev->speed > 400 || cpu_is_omap2430()) |
343 | internal_clk = 19200; | 343 | internal_clk = 19200; |
344 | else if (dev->speed > 100) | 344 | else if (dev->speed > 100) |
345 | internal_clk = 9600; | 345 | internal_clk = 9600; |