From: Paul Mundt Date: Tue, 2 Feb 2010 02:33:45 +0000 (+0900) Subject: Merge branch 'sh/stable-updates' X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=9d3f1881abeae0494a27716b08fcf2d3264bb0fa;p=linux-edison.git Merge branch 'sh/stable-updates' --- 9d3f1881abeae0494a27716b08fcf2d3264bb0fa diff --cc arch/sh/boards/mach-se/7724/setup.c index 242dc843f57,858ecb25d46..c7dbbece44b --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@@ -522,9 -531,9 +522,9 @@@ static int __init sh_eth_is_eeprom_read int t = 10000; while (t--) { - if (!ctrl_inw(EEPROM_STAT)) + if (!__raw_readw(EEPROM_STAT)) return 1; - cpu_relax(); + udelay(1); } printk(KERN_ERR "ms7724se can not access to eeprom\n");