diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:34:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-23 09:34:07 -0700 |
| commit | 746942d06acdb4dd78d16baa5f3728a48a033bdd (patch) | |
| tree | 1470ffab015f6b7c2ff6f44314f9fab17d3a4c3f /arch/x86/Kconfig | |
| parent | c11f6c82581e8be4e1829c677db54e7f55cebece (diff) | |
| parent | c602c65b2f81d14456771d1e3f15d1381f4b7efa (diff) | |
| download | linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.tar.gz linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.tar.bz2 linux-746942d06acdb4dd78d16baa5f3728a48a033bdd.zip | |
Merge branch 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6
* 'sfi-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6:
SFI: remove unneeded includes
sfi: Remove unused code
SFI: Hook PCI MMCONFIG
x86: add arch-specific SFI support
SFI: add capability to parse ACPI tables
SFI: add platform-independent core support
SFI: create linux/sfi.h
SFI: Simple Firmware Interface - MAINTAINERS, Kconfig
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7c7a54bed4a6..74d647ecf905 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1666,6 +1666,8 @@ source "kernel/power/Kconfig" source "drivers/acpi/Kconfig" +source "drivers/sfi/Kconfig" + config X86_APM_BOOT bool default y @@ -1861,7 +1863,7 @@ config PCI_DIRECT config PCI_MMCONFIG def_bool y - depends on X86_32 && PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) + depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY) config PCI_OLPC def_bool y |