diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-02 03:33:45 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-02 03:33:45 +0100 |
| commit | 9d3f1881abeae0494a27716b08fcf2d3264bb0fa (patch) | |
| tree | f457dd2d35af29bc831b93865efa47229d0b9bee /arch/sh/boards | |
| parent | sh: Improved multi-resource handling for SH7780 PCI. (diff) | |
| parent | sh: Fix access to released memory in clk_debugfs_register_one() (diff) | |
| download | linux-9d3f1881abeae0494a27716b08fcf2d3264bb0fa.tar.xz linux-9d3f1881abeae0494a27716b08fcf2d3264bb0fa.zip | |
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) while (t--) { if (!__raw_readw(EEPROM_STAT)) return 1; - cpu_relax(); + udelay(1); } printk(KERN_ERR "ms7724se can not access to eeprom\n"); |