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/m68knommu/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/m68knommu/Kconfig')
| -rw-r--r-- | arch/m68knommu/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68knommu/Kconfig b/arch/m68knommu/Kconfig index e767f2ddae72..6d920d4bdc3d 100644 --- a/arch/m68knommu/Kconfig +++ b/arch/m68knommu/Kconfig | |||
| @@ -161,8 +161,8 @@ config CLOCK_FREQ | |||
| 161 | frequency, it may or may not be the same as the external clock | 161 | frequency, it may or may not be the same as the external clock |
| 162 | crystal fitted to your board. Some processors have an internal | 162 | crystal fitted to your board. Some processors have an internal |
| 163 | PLL and can have their frequency programmed at run time, others | 163 | PLL and can have their frequency programmed at run time, others |
| 164 | use internal dividers. In gernal the kernel won't setup a PLL | 164 | use internal dividers. In general the kernel won't setup a PLL |
| 165 | if it is fitted (there are some expections). This value will be | 165 | if it is fitted (there are some exceptions). This value will be |
| 166 | specific to the exact CPU that you are using. | 166 | specific to the exact CPU that you are using. |
| 167 | 167 | ||
| 168 | config CLOCK_DIV | 168 | config CLOCK_DIV |
| @@ -495,7 +495,7 @@ config VECTORBASE | |||
| 495 | hex "Address of the base of system vectors" | 495 | hex "Address of the base of system vectors" |
| 496 | default "0" | 496 | default "0" |
| 497 | help | 497 | help |
| 498 | Define the address of the the system vectors. Commonly this is | 498 | Define the address of the system vectors. Commonly this is |
| 499 | put at the start of RAM, but it doesn't have to be. On ColdFire | 499 | put at the start of RAM, but it doesn't have to be. On ColdFire |
| 500 | platforms this address is programmed into the VBR register, thus | 500 | platforms this address is programmed into the VBR register, thus |
| 501 | actually setting the address to use. | 501 | actually setting the address to use. |