aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authormatt mooney <mfm@muteddisk.com>2011-06-12 14:17:30 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2011-07-01 18:12:02 -0400
commit113647a281037d8b6f32e07f42a1328c7cd3da3b (patch)
treec7805d252f304d5334d232754432de779530cf3d /drivers/base
parentb6badddcccf9d48a01e9a9b33c47922976291ab6 (diff)
driver-core: Kconfig grammar corrections in firmware configuration
Fix some grammatical errors and reword a few sentences. Signed-off-by: matt mooney <mfm@muteddisk.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/Kconfig59
1 files changed, 29 insertions, 30 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
index d57e8d0fb823..5fe7fd23ed65 100644
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
@@ -65,17 +65,17 @@ config PREVENT_FIRMWARE_BUILD
65 default y 65 default y
66 help 66 help
67 Say yes to avoid building firmware. Firmware is usually shipped 67 Say yes to avoid building firmware. Firmware is usually shipped
68 with the driver, and only when updating the firmware a rebuild 68 with the driver and only when updating the firmware should a
69 should be made. 69 rebuild be made.
70 If unsure say Y here. 70 If unsure, say Y here.
71 71
72config FW_LOADER 72config FW_LOADER
73 tristate "Userspace firmware loading support" if EXPERT 73 tristate "Userspace firmware loading support" if EXPERT
74 default y 74 default y
75 ---help--- 75 ---help---
76 This option is provided for the case where no in-kernel-tree modules 76 This option is provided for the case where none of the in-tree modules
77 require userspace firmware loading support, but a module built outside 77 require userspace firmware loading support, but a module built
78 the kernel tree does. 78 out-of-tree does.
79 79
80config FIRMWARE_IN_KERNEL 80config FIRMWARE_IN_KERNEL
81 bool "Include in-kernel firmware blobs in kernel binary" 81 bool "Include in-kernel firmware blobs in kernel binary"
@@ -83,22 +83,22 @@ config FIRMWARE_IN_KERNEL
83 default y 83 default y
84 help 84 help
85 The kernel source tree includes a number of firmware 'blobs' 85 The kernel source tree includes a number of firmware 'blobs'
86 which are used by various drivers. The recommended way to 86 that are used by various drivers. The recommended way to
87 use these is to run "make firmware_install" and to copy the 87 use these is to run "make firmware_install" and to copy the
88 resulting binary files created in usr/lib/firmware directory 88 resulting binary files created in usr/lib/firmware/ of the
89 of the kernel tree to the /lib/firmware on your system so 89 kernel tree to /lib/firmware/ on your system so that they can
90 that they can be loaded by userspace helpers on request. 90 be loaded by userspace helpers on request.
91 91
92 Enabling this option will build each required firmware blob 92 Enabling this option will build each required firmware blob
93 into the kernel directly, where request_firmware() will find 93 into the kernel directly, where request_firmware() will find
94 them without having to call out to userspace. This may be 94 them without having to call out to userspace. This may be
95 useful if your root file system requires a device which uses 95 useful if your root file system requires a device that uses
96 such firmware, and do not wish to use an initrd. 96 such firmware and do not wish to use an initrd.
97 97
98 This single option controls the inclusion of firmware for 98 This single option controls the inclusion of firmware for
99 every driver which uses request_firmware() and ships its 99 every driver that uses request_firmware() and ships its
100 firmware in the kernel source tree, to avoid a proliferation 100 firmware in the kernel source tree, which avoids a
101 of 'Include firmware for xxx device' options. 101 proliferation of 'Include firmware for xxx device' options.
102 102
103 Say 'N' and let firmware be loaded from userspace. 103 Say 'N' and let firmware be loaded from userspace.
104 104
@@ -106,27 +106,27 @@ config EXTRA_FIRMWARE
106 string "External firmware blobs to build into the kernel binary" 106 string "External firmware blobs to build into the kernel binary"
107 depends on FW_LOADER 107 depends on FW_LOADER
108 help 108 help
109 This option allows firmware to be built into the kernel, for the 109 This option allows firmware to be built into the kernel for the case
110 cases where the user either cannot or doesn't want to provide it from 110 where the user either cannot or doesn't want to provide it from
111 userspace at runtime (for example, when the firmware in question is 111 userspace at runtime (for example, when the firmware in question is
112 required for accessing the boot device, and the user doesn't want to 112 required for accessing the boot device, and the user doesn't want to
113 use an initrd). 113 use an initrd).
114 114
115 This option is a string, and takes the (space-separated) names of the 115 This option is a string and takes the (space-separated) names of the
116 firmware files -- the same names which appear in MODULE_FIRMWARE() 116 firmware files -- the same names that appear in MODULE_FIRMWARE()
117 and request_firmware() in the source. These files should exist under 117 and request_firmware() in the source. These files should exist under
118 the directory specified by the EXTRA_FIRMWARE_DIR option, which is 118 the directory specified by the EXTRA_FIRMWARE_DIR option, which is
119 by default the firmware/ subdirectory of the kernel source tree. 119 by default the firmware subdirectory of the kernel source tree.
120 120
121 So, for example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", 121 For example, you might set CONFIG_EXTRA_FIRMWARE="usb8388.bin", copy
122 copy the usb8388.bin file into the firmware/ directory, and build the 122 the usb8388.bin file into the firmware directory, and build the kernel.
123 kernel. Then any request_firmware("usb8388.bin") will be 123 Then any request_firmware("usb8388.bin") will be satisfied internally
124 satisfied internally without needing to call out to userspace. 124 without needing to call out to userspace.
125 125
126 WARNING: If you include additional firmware files into your binary 126 WARNING: If you include additional firmware files into your binary
127 kernel image which are not available under the terms of the GPL, 127 kernel image that are not available under the terms of the GPL,
128 then it may be a violation of the GPL to distribute the resulting 128 then it may be a violation of the GPL to distribute the resulting
129 image -- since it combines both GPL and non-GPL work. You should 129 image since it combines both GPL and non-GPL work. You should
130 consult a lawyer of your own before distributing such an image. 130 consult a lawyer of your own before distributing such an image.
131 131
132config EXTRA_FIRMWARE_DIR 132config EXTRA_FIRMWARE_DIR
@@ -136,10 +136,9 @@ config EXTRA_FIRMWARE_DIR
136 help 136 help
137 This option controls the directory in which the kernel build system 137 This option controls the directory in which the kernel build system
138 looks for the firmware files listed in the EXTRA_FIRMWARE option. 138 looks for the firmware files listed in the EXTRA_FIRMWARE option.
139 The default is the firmware/ directory in the kernel source tree, 139 The default is firmware/ in the kernel source tree, but by changing
140 but by changing this option you can point it elsewhere, such as 140 this option you can point it elsewhere, such as /lib/firmware/ or
141 the /lib/firmware/ directory or another separate directory 141 some other directory containing the firmware files.
142 containing firmware files.
143 142
144config DEBUG_DRIVER 143config DEBUG_DRIVER
145 bool "Driver Core verbose debug messages" 144 bool "Driver Core verbose debug messages"