diff options
| author | David S. Miller <davem@davemloft.net> | 2012-11-18 04:00:43 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-11-18 04:00:43 +0100 |
| commit | 67f4efdce7d85282fbd5832cddc80a07eb89b6d6 (patch) | |
| tree | 9a1771ef13b27abdf8cf172e5b7556ab93e5c48c /arch/h8300/include | |
| parent | net: use right lock in __dev_remove_offload (diff) | |
| parent | Linux 3.7-rc6 (diff) | |
| download | linux-67f4efdce7d85282fbd5832cddc80a07eb89b6d6.tar.xz linux-67f4efdce7d85282fbd5832cddc80a07eb89b6d6.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor line offset auto-merges.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/h8300/include')
| -rw-r--r-- | arch/h8300/include/asm/cache.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/h8300/include/asm/cache.h b/arch/h8300/include/asm/cache.h index c6350283649d..05887a1d80e5 100644 --- a/arch/h8300/include/asm/cache.h +++ b/arch/h8300/include/asm/cache.h @@ -2,7 +2,8 @@ #define __ARCH_H8300_CACHE_H /* bytes per L1 cache line */ -#define L1_CACHE_BYTES 4 +#define L1_CACHE_SHIFT 2 +#define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) /* m68k-elf-gcc 2.95.2 doesn't like these */ |