diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-01 21:33:45 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-01 21:33:45 -0500 |
| commit | 9d3f1881abeae0494a27716b08fcf2d3264bb0fa (patch) | |
| tree | f457dd2d35af29bc831b93865efa47229d0b9bee /arch/sh/boards | |
| parent | b6c58b1d987a5795086c5c2babd8c7367d2fdb8c (diff) | |
| parent | bc10e875d4aeaa93a0d418d8b4346b72f5067ea0 (diff) | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/sh/boards')
| -rw-r--r-- | arch/sh/boards/mach-se/7724/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c index 242dc843f574..c7dbbece44b0 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c | |||
| @@ -524,7 +524,7 @@ static int __init sh_eth_is_eeprom_ready(void) | |||
| 524 | while (t--) { | 524 | while (t--) { |
| 525 | if (!__raw_readw(EEPROM_STAT)) | 525 | if (!__raw_readw(EEPROM_STAT)) |
| 526 | return 1; | 526 | return 1; |
| 527 | cpu_relax(); | 527 | udelay(1); |
| 528 | } | 528 | } |
| 529 | 529 | ||
| 530 | printk(KERN_ERR "ms7724se can not access to eeprom\n"); | 530 | printk(KERN_ERR "ms7724se can not access to eeprom\n"); |