i2c-omap: Fix mismerge
authorTony Lindgren <tony@atomide.com>
Fri, 20 Feb 2009 18:48:01 +0000 (10:48 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Feb 2009 18:48:01 +0000 (10:48 -0800)
Signed-off-by: Tony Lindgren <tony@atomide.com>

No differences found