diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 18:16:27 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-01-21 18:16:27 +0300 |
| commit | 970114a1dacf5f1f47aae9ad75c0abca42d8499c (patch) | |
| tree | 4373412a410d5d61226dfb6a845b74e714a7c6e3 /arch/sh/boards/mach-se/7724/setup.c | |
| parent | def20529227a5c0938c374d11781bd0dbd5edee4 (diff) | |
| parent | 79f211b8e17205aae0304c58518fbc58506e52e3 (diff) | |
| download | linux-970114a1dacf5f1f47aae9ad75c0abca42d8499c.tar.xz | |
Merge branch 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* 'sh/for-2.6.33' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6:
sh64: wire up sys_accept4.
sh: unwire sys_recvmmsg.
sh: ms7724: Correct sh-eth EEPROM polling timeout.
Diffstat (limited to 'arch/sh/boards/mach-se/7724/setup.c')
| -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 5d0f70b46c97..858ecb25d469 100644 --- a/arch/sh/boards/mach-se/7724/setup.c +++ b/arch/sh/boards/mach-se/7724/setup.c @@ -533,7 +533,7 @@ static int __init sh_eth_is_eeprom_ready(void) while (t--) { if (!ctrl_inw(EEPROM_STAT)) return 1; - cpu_relax(); + udelay(1); } printk(KERN_ERR "ms7724se can not access to eeprom\n"); |