diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 21:44:12 -0500 |
| commit | db9edfd7e339ca4113153d887e782dd05be5a9eb (patch) | |
| tree | 0a4ba12447a0cabc800adc7e9667d284777b0181 /drivers/base/Kconfig | |
| parent | 631b034724364b413e8a52e7c2e03a9d77e4c2b4 (diff) | |
| parent | fd586bacf439f36dea9b9bf6e6133ac87df2730c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
Trivial manual merge fixup for usb_find_interface clashes.
Diffstat (limited to 'drivers/base/Kconfig')
| -rw-r--r-- | drivers/base/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 934149c1512b..f0eff3dac58d 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig | |||
| @@ -19,11 +19,11 @@ config PREVENT_FIRMWARE_BUILD | |||
| 19 | If unsure say Y here. | 19 | If unsure say Y here. |
| 20 | 20 | ||
| 21 | config FW_LOADER | 21 | config FW_LOADER |
| 22 | tristate "Hotplug firmware loading support" | 22 | tristate "Userspace firmware loading support" |
| 23 | select HOTPLUG | 23 | select HOTPLUG |
| 24 | ---help--- | 24 | ---help--- |
| 25 | This option is provided for the case where no in-kernel-tree modules | 25 | This option is provided for the case where no in-kernel-tree modules |
| 26 | require hotplug firmware loading support, but a module built outside | 26 | require userspace firmware loading support, but a module built outside |
| 27 | the kernel tree does. | 27 | the kernel tree does. |
| 28 | 28 | ||
| 29 | config DEBUG_DRIVER | 29 | config DEBUG_DRIVER |