aboutsummaryrefslogtreecommitdiffstats
path: root/init
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 19:43:29 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-15 19:43:29 -0500
commit3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch)
treebaec074db38a5ceaaabbcee76f199acef43bb42a /init
parent0238cb4e7583c521bb3538060f98a73e65f61324 (diff)
parentfb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'init')
-rw-r--r--init/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 25f4d74adf7e..7efa729d2cf4 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -99,7 +99,7 @@ config SWAP
99 default y 99 default y
100 help 100 help
101 This option allows you to choose whether you want to have support 101 This option allows you to choose whether you want to have support
102 for socalled swap devices or swap files in your kernel that are 102 for so called swap devices or swap files in your kernel that are
103 used to provide more virtual memory than the actual RAM present 103 used to provide more virtual memory than the actual RAM present
104 in your computer. If unsure say Y. 104 in your computer. If unsure say Y.
105 105