diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 16:42:14 +0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-02-28 16:42:21 +0400 |
commit | fb0b82b32ce17564bc64cede50bf4a3204eecc60 (patch) | |
tree | 00b5e466074c6fb373d64c493b3341186024acc7 /arch/sh/mm/cache-sh2a.c | |
parent | a173fc693b25216c5c834978f4fafd731fd4ff94 (diff) | |
parent | 43de6a7dda6e9a7345e218e688f2092f991126f0 (diff) | |
download | linux-fb0b82b32ce17564bc64cede50bf4a3204eecc60.tar.xz |
Merge branch 'board-specific' of git://github.com/hzhuang1/linux into next/boards
* 'board-specific' of git://github.com/hzhuang1/linux: (5 commits)
ARM: pxa: add dummy clock for pxa25x and pxa27x
ARM: mmp: append irq name of gpio device
pxa/hx4700: Fix PXA_GPIO_IRQ_BASE/IRQ_NUM values
pxa/hx4700: Add ASIC3 LED support
pxa/hx4700: Correct StrataFlash block size discovery
(update to v3.3-rc5)
Diffstat (limited to 'arch/sh/mm/cache-sh2a.c')
-rw-r--r-- | arch/sh/mm/cache-sh2a.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/mm/cache-sh2a.c b/arch/sh/mm/cache-sh2a.c index ae08cbbfa569..949e2d3138a0 100644 --- a/arch/sh/mm/cache-sh2a.c +++ b/arch/sh/mm/cache-sh2a.c @@ -23,6 +23,7 @@ #define MAX_OCACHE_PAGES 32 #define MAX_ICACHE_PAGES 32 +#ifdef CONFIG_CACHE_WRITEBACK static void sh2a_flush_oc_line(unsigned long v, int way) { unsigned long addr = (v & 0x000007f0) | (way << 11); @@ -34,6 +35,7 @@ static void sh2a_flush_oc_line(unsigned long v, int way) __raw_writel(data, CACHE_OC_ADDRESS_ARRAY | addr); } } +#endif static void sh2a_invalidate_line(unsigned long cache_addr, unsigned long v) { |