aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/firmware
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-12-14 18:01:16 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:53:34 -0800
commit9b6e3e42a48ea535c0ed79df32d1353d5e547bed (patch)
tree5a5414b35342bba0fb22b1beab9890c4dda5a5ec /drivers/firmware
parentca54cb8c9eb38095dc420b73c6380ce1dbeb10fa (diff)
downloadkernel_samsung_smdk4412-9b6e3e42a48ea535c0ed79df32d1353d5e547bed.zip
kernel_samsung_smdk4412-9b6e3e42a48ea535c0ed79df32d1353d5e547bed.tar.gz
kernel_samsung_smdk4412-9b6e3e42a48ea535c0ed79df32d1353d5e547bed.tar.bz2
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>
Diffstat (limited to 'drivers/firmware')
-rw-r--r--drivers/firmware/Kconfig4
1 files changed, 2 insertions, 2 deletions
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