diff options
author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
---|---|---|
committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/firmware/Kconfig | |
parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/firmware/Kconfig')
-rw-r--r-- | drivers/firmware/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index ebb9e51deb0c..1b03ba1d0834 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig | |||
@@ -7,7 +7,7 @@ menu "Firmware Drivers" | |||
7 | 7 | ||
8 | config EDD | 8 | config EDD |
9 | tristate "BIOS Enhanced Disk Drive calls determine boot disk" | 9 | tristate "BIOS Enhanced Disk Drive calls determine boot disk" |
10 | depends on !IA64 | 10 | depends on X86 |
11 | help | 11 | help |
12 | Say Y or M here if you want to enable BIOS Enhanced Disk Drive | 12 | Say Y or M here if you want to enable BIOS Enhanced Disk Drive |
13 | Services real mode BIOS calls to determine which disk | 13 | Services real mode BIOS calls to determine which disk |
@@ -28,7 +28,7 @@ config EDD_OFF | |||
28 | 28 | ||
29 | config FIRMWARE_MEMMAP | 29 | config FIRMWARE_MEMMAP |
30 | bool "Add firmware-provided memory map to sysfs" if EMBEDDED | 30 | bool "Add firmware-provided memory map to sysfs" if EMBEDDED |
31 | default (X86_64 || X86_32) | 31 | default X86 |
32 | help | 32 | help |
33 | Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap. | 33 | Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap. |
34 | That memory map is used for example by kexec to set up parameter area | 34 | That memory map is used for example by kexec to set up parameter area |