diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-06-11 10:35:00 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-06-11 10:35:00 -0400 |
| commit | 42578c82e0f1810a07ebe29cb05e874893243d8c (patch) | |
| tree | e2a3811677d3594e891fc82c940438f6b6abc3e0 /arch/arm/include/asm/hardware | |
| parent | 2631182bf93919577730e6a6c4345308db590057 (diff) | |
| parent | 85d6943af50537d3aec58b967ffbd3fec88453e9 (diff) | |
Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6 into devel
Conflicts:
arch/arm/Kconfig
arch/arm/kernel/smp.c
arch/arm/mach-realview/Makefile
arch/arm/mach-realview/platsmp.c
Diffstat (limited to 'arch/arm/include/asm/hardware')
| -rw-r--r-- | arch/arm/include/asm/hardware/cache-l2x0.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/hardware/cache-l2x0.h b/arch/arm/include/asm/hardware/cache-l2x0.h index 64f2252a25cd..cdb9022716fd 100644 --- a/arch/arm/include/asm/hardware/cache-l2x0.h +++ b/arch/arm/include/asm/hardware/cache-l2x0.h | |||
| @@ -24,6 +24,8 @@ | |||
| 24 | #define L2X0_CACHE_TYPE 0x004 | 24 | #define L2X0_CACHE_TYPE 0x004 |
| 25 | #define L2X0_CTRL 0x100 | 25 | #define L2X0_CTRL 0x100 |
| 26 | #define L2X0_AUX_CTRL 0x104 | 26 | #define L2X0_AUX_CTRL 0x104 |
| 27 | #define L2X0_TAG_LATENCY_CTRL 0x108 | ||
| 28 | #define L2X0_DATA_LATENCY_CTRL 0x10C | ||
| 27 | #define L2X0_EVENT_CNT_CTRL 0x200 | 29 | #define L2X0_EVENT_CNT_CTRL 0x200 |
| 28 | #define L2X0_EVENT_CNT1_CFG 0x204 | 30 | #define L2X0_EVENT_CNT1_CFG 0x204 |
| 29 | #define L2X0_EVENT_CNT0_CFG 0x208 | 31 | #define L2X0_EVENT_CNT0_CFG 0x208 |