diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 19:35:11 -0400 |
| commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
| tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /arch/ppc/Kconfig | |
| parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
| parent | a847825970e741e20a09c659978baa34016b63bc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'arch/ppc/Kconfig')
| -rw-r--r-- | arch/ppc/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig index fdd9e7b66244..077711e63104 100644 --- a/arch/ppc/Kconfig +++ b/arch/ppc/Kconfig | |||
| @@ -1345,7 +1345,7 @@ config CONSISTENT_START_BOOL | |||
| 1345 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE | 1345 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE |
| 1346 | help | 1346 | help |
| 1347 | This option allows you to set the base virtual address | 1347 | This option allows you to set the base virtual address |
| 1348 | of the the consistent memory pool. This pool of virtual | 1348 | of the consistent memory pool. This pool of virtual |
| 1349 | memory is used to make consistent memory allocations. | 1349 | memory is used to make consistent memory allocations. |
| 1350 | 1350 | ||
| 1351 | config CONSISTENT_START | 1351 | config CONSISTENT_START |
| @@ -1356,7 +1356,7 @@ config CONSISTENT_SIZE_BOOL | |||
| 1356 | bool "Set custom consistent memory pool size" | 1356 | bool "Set custom consistent memory pool size" |
| 1357 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE | 1357 | depends on ADVANCED_OPTIONS && NOT_COHERENT_CACHE |
| 1358 | help | 1358 | help |
| 1359 | This option allows you to set the size of the the | 1359 | This option allows you to set the size of the |
| 1360 | consistent memory pool. This pool of virtual memory | 1360 | consistent memory pool. This pool of virtual memory |
| 1361 | is used to make consistent memory allocations. | 1361 | is used to make consistent memory allocations. |
| 1362 | 1362 | ||