diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:25 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:25 -0400 |
| commit | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (patch) | |
| tree | c685060f260410e6704c9dfd457ed8c347141f1d /arch/arm/mm/Kconfig | |
| parent | 2472f3c8d8fc18b25b2cf1574c036e238187c0ff (diff) | |
| parent | 10a8c3839810ac9af1aec836d61b92e7a879f5fa (diff) | |
Merge branch 'misc' into devel
Conflicts:
arch/arm/Kconfig
Diffstat (limited to 'arch/arm/mm/Kconfig')
| -rw-r--r-- | arch/arm/mm/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index e4509bae8fc4..05b26a03c209 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
| @@ -845,6 +845,11 @@ config CACHE_XSC3L2 | |||
| 845 | help | 845 | help |
| 846 | This option enables the L2 cache on XScale3. | 846 | This option enables the L2 cache on XScale3. |
| 847 | 847 | ||
| 848 | config ARM_L1_CACHE_SHIFT_6 | ||
| 849 | bool | ||
| 850 | help | ||
| 851 | Setting ARM L1 cache line size to 64 Bytes. | ||
| 852 | |||
| 848 | config ARM_L1_CACHE_SHIFT | 853 | config ARM_L1_CACHE_SHIFT |
| 849 | int | 854 | int |
| 850 | default 6 if ARM_L1_CACHE_SHIFT_6 | 855 | default 6 if ARM_L1_CACHE_SHIFT_6 |