firmware: only allow EDD on x86

Rather than have the EDD depend on !ia64 (and assuming that only ia64,
x86, x86_64 will be including this Kconfig), have EDD depend on the only
arches which can support this code.  This should allow all other arches to
cleanly include the firmware Kconfig.

Also simplify the x86 string used by FIRMWARE_MEMMAP to match EDD.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Matt Domsch <Matt_Domsch@dell.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Frysinger 2009-12-14 18:01:16 -08:00 committed by Linus Torvalds
parent ca54cb8c9e
commit 9b6e3e42a4

View file

@ -7,7 +7,7 @@ menu "Firmware Drivers"
config EDD config EDD
tristate "BIOS Enhanced Disk Drive calls determine boot disk" tristate "BIOS Enhanced Disk Drive calls determine boot disk"
depends on !IA64 depends on X86
help help
Say Y or M here if you want to enable BIOS Enhanced Disk Drive Say Y or M here if you want to enable BIOS Enhanced Disk Drive
Services real mode BIOS calls to determine which disk Services real mode BIOS calls to determine which disk
@ -28,7 +28,7 @@ config EDD_OFF
config FIRMWARE_MEMMAP config FIRMWARE_MEMMAP
bool "Add firmware-provided memory map to sysfs" if EMBEDDED bool "Add firmware-provided memory map to sysfs" if EMBEDDED
default (X86_64 || X86_32) default X86
help help
Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap. Add the firmware-provided (unmodified) memory map to /sys/firmware/memmap.
That memory map is used for example by kexec to set up parameter area That memory map is used for example by kexec to set up parameter area