Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (187 commits)
  sh: remove dead LED code for migo-r and ms7724se
  sh: ecovec build fix for CONFIG_I2C=n
  sh: ecovec r-standby support
  sh: ms7724se r-standby support
  sh: SH-Mobile R-standby register save/restore
  clocksource: Fix up a registration/IRQ race in the sh drivers.
  sh: ms7724: modify scan_timing for KEYSC
  sh: ms7724: Add sh_sir support
  sh: mach-ecovec24: Add sh_sir support
  sh: wire up SET/GET_UNALIGN_CTL.
  sh: allow alignment fault mode to be configured at kernel boot.
  sh: sh7724: Update FSI/SPU2 clock
  sh: always enable sh7724 vpu_clk and set to 166MHz on Ecovec
  sh: add sh7724 kick callback to clk_div4_table
  sh: introduce struct clk_div4_table
  sh: clock-cpg div4 set_rate() shift fix
  sh: Turn on speculative return for SH7785 and SH7786
  sh: Merge legacy and dynamic PMB modes.
  sh: Use uncached I/O helpers in PMB setup.
  sh: Provide uncached I/O helpers.
  ...

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/sh/mm/cache-sh3.c b/arch/sh/mm/cache-sh3.c
index faef80c98134..e37523f65195 100644
--- a/arch/sh/mm/cache-sh3.c
+++ b/arch/sh/mm/cache-sh3.c
@@ -50,12 +50,12 @@ static void sh3__flush_wback_region(void *start, int size)
                         p = __pa(v);
                         addr = addrstart | (v & current_cpu_data.dcache.entry_mask);
                         local_irq_save(flags);
-                        data = ctrl_inl(addr);
+                        data = __raw_readl(addr);
 
                         if ((data & CACHE_PHYSADDR_MASK) ==
                             (p & CACHE_PHYSADDR_MASK)) {
                                 data &= ~SH_CACHE_UPDATED;
-                                ctrl_outl(data, addr);
+                                __raw_writel(data, addr);
                                 local_irq_restore(flags);
                                 break;
                         }
@@ -86,7 +86,7 @@ static void sh3__flush_purge_region(void *start, int size)
                 data = (v & 0xfffffc00); /* _Virtual_ address, ~U, ~V */
                 addr = CACHE_OC_ADDRESS_ARRAY |
                         (v & current_cpu_data.dcache.entry_mask) | SH_CACHE_ASSOC;
-                ctrl_outl(data, addr);
+                __raw_writel(data, addr);
         }
 }