diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/base/Kconfig | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/base/Kconfig')
| -rw-r--r-- | drivers/base/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig index 80502dc6ed66..0b4e22436935 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig | |||
| @@ -20,7 +20,7 @@ config PREVENT_FIRMWARE_BUILD | |||
| 20 | 20 | ||
| 21 | config FW_LOADER | 21 | config FW_LOADER |
| 22 | tristate "Userspace firmware loading support" | 22 | tristate "Userspace firmware loading support" |
| 23 | select HOTPLUG | 23 | depends on 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 userspace firmware loading support, but a module built outside | 26 | require userspace firmware loading support, but a module built outside |