diff options
| author | Paul Mackerras <paulus@samba.org> | 2009-04-06 22:54:08 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2009-04-06 22:54:08 -0400 |
| commit | ae6e59caefd8d4097ccb096c95df95ec7e52fe88 (patch) | |
| tree | f72b77d41c9f5a3b18fb52e505d60dba2ad913a5 /arch/powerpc/Kconfig | |
| parent | 0221c81b1b8eb0cbb6b30a0ced52ead32d2b4e4c (diff) | |
| parent | f379188958ae8af30105eb1f27d0e0abf6a51558 (diff) | |
Merge branch 'next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into merge
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index 9e08d8a69fdf..e0f0a4dbe9ae 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -775,6 +775,7 @@ config LOWMEM_CAM_NUM_BOOL | |||
| 775 | Say N here unless you know what you are doing. | 775 | Say N here unless you know what you are doing. |
| 776 | 776 | ||
| 777 | config LOWMEM_CAM_NUM | 777 | config LOWMEM_CAM_NUM |
| 778 | depends on FSL_BOOKE | ||
| 778 | int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL | 779 | int "Number of CAMs to use to map low memory" if LOWMEM_CAM_NUM_BOOL |
| 779 | default 3 | 780 | default 3 |
| 780 | 781 | ||