diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:49:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:49:58 -0400 |
commit | e80ab411e589e00550e2e6e5a6a02d59cc730357 (patch) | |
tree | 870225ff7b5b8d03e82a996963213a4bb9cce248 /drivers/firmware/Kconfig | |
parent | 529a41e36673b518c9e091f3a8d932b6b9e3c461 (diff) | |
parent | ee959b00c335d7780136c5abda37809191fe52c3 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6: (36 commits)
SCSI: convert struct class_device to struct device
DRM: remove unused dev_class
IB: rename "dev" to "srp_dev" in srp_host structure
IB: convert struct class_device to struct device
memstick: convert struct class_device to struct device
driver core: replace remaining __FUNCTION__ occurrences
sysfs: refill attribute buffer when reading from offset 0
PM: Remove destroy_suspended_device()
Firmware: add iSCSI iBFT Support
PM: Remove legacy PM (fix)
Kobject: Replace list_for_each() with list_for_each_entry().
SYSFS: Explicitly include required header file slab.h.
Driver core: make device_is_registered() work for class devices
PM: Convert wakeup flag accessors to inline functions
PM: Make wakeup flags available whenever CONFIG_PM is set
PM: Fix misuse of wakeup flag accessors in serial core
Driver core: Call device_pm_add() after bus_add_device() in device_add()
PM: Handle device registrations during suspend/resume
block: send disk "change" event for rescan_partitions()
sysdev: detect multiple driver registrations
...
Fixed trivial conflict in include/linux/memory.h due to semaphore header
file change (made irrelevant by the change to mutex).
Diffstat (limited to 'drivers/firmware/Kconfig')
-rw-r--r-- | drivers/firmware/Kconfig | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index 05f02a326f1c..40ffd767647d 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig | |||
@@ -93,4 +93,24 @@ config DMIID | |||
93 | information from userspace through /sys/class/dmi/id/ or if you want | 93 | information from userspace through /sys/class/dmi/id/ or if you want |
94 | DMI-based module auto-loading. | 94 | DMI-based module auto-loading. |
95 | 95 | ||
96 | config ISCSI_IBFT_FIND | ||
97 | bool "iSCSI Boot Firmware Table Attributes" | ||
98 | depends on X86 | ||
99 | default n | ||
100 | help | ||
101 | This option enables the kernel to find the region of memory | ||
102 | in which the ISCSI Boot Firmware Table (iBFT) resides. This | ||
103 | is necessary for iSCSI Boot Firmware Table Attributes module to work | ||
104 | properly. | ||
105 | |||
106 | config ISCSI_IBFT | ||
107 | tristate "iSCSI Boot Firmware Table Attributes module" | ||
108 | depends on ISCSI_IBFT_FIND | ||
109 | default n | ||
110 | help | ||
111 | This option enables support for detection and exposing of iSCSI | ||
112 | Boot Firmware Table (iBFT) via sysfs to userspace. If you wish to | ||
113 | detect iSCSI boot parameters dynamically during system boot, say Y. | ||
114 | Otherwise, say N. | ||
115 | |||
96 | endmenu | 116 | endmenu |