Merge branch 'sh/stable-updates'
Paul Mundt [Tue, 2 Feb 2010 02:33:45 +0000 (11:33 +0900)]
1  2 
arch/sh/boards/mach-se/7724/setup.c
arch/sh/kernel/process_64.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");
Simple merge