diff options
| author | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 12:17:19 -0400 |
|---|---|---|
| committer | Stefan Richter <stefanr@s5r6.in-berlin.de> | 2006-09-17 12:19:31 -0400 |
| commit | 9b4f2e9576658c4e52d95dc8d309f51b2e2db096 (patch) | |
| tree | 7b1902b0f931783fccc6fee45c6f9c16b4fde5ce /drivers/base/Kconfig | |
| parent | 3c6c65f5ed5a6d307bd607aecd06d658c0934d88 (diff) | |
| parent | 803db244b9f71102e366fd689000c1417b9a7508 (diff) | |
ieee1394: merge from Linus
Conflicts: drivers/ieee1394/hosts.c
Patch "lockdep: annotate ieee1394 skb-queue-head locking" was meddling
with patch "ieee1394: fix kerneldoc of hpsb_alloc_host".
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
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 |