From: Mike Frysinger Date: Tue, 15 Dec 2009 02:01:16 +0000 (-0800) Subject: firmware: only allow EDD on x86 X-Git-Tag: upstream/snapshot3+hdmi~16171 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b6e3e42a48ea535c0ed79df32d1353d5e547bed;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Acked-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig index ebb9e51..1b03ba1 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -7,7 +7,7 @@ menu "Firmware Drivers" config EDD tristate "BIOS Enhanced Disk Drive calls determine boot disk" - depends on !IA64 + depends on X86 help Say Y or M here if you want to enable BIOS Enhanced Disk Drive Services real mode BIOS calls to determine which disk @@ -28,7 +28,7 @@ config EDD_OFF config FIRMWARE_MEMMAP bool "Add firmware-provided memory map to sysfs" if EMBEDDED - default (X86_64 || X86_32) + default X86 help 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