From d59544405a320005cec2f4bcb71ade9e446450fb Mon Sep 17 00:00:00 2001 From: Alexander Nyberg Date: Fri, 27 May 2005 12:48:50 +0200 Subject: [PATCH] --- yaml --- r: 1463 b: refs/heads/master c: 8aadff7dd519800ce7c0e7fb75dcd4438b373134 h: refs/heads/master i: 1461: 602ca4ff24a49f1b3c71c0e3f504777c9907aa29 1459: f9ce45459bebceb774cb1d8825b5e8994ea03cf6 1455: b9b39ecaf12f11bc57a1c5aadbc6ad9dfff5eddd v: v3 --- [refs] | 2 +- trunk/arch/i386/Kconfig | 2 +- trunk/arch/x86_64/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0717b82c8184..8dc1f11fa0e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3e11c3ce0a4ce3d30802babccb0e5f881778ccf1 +refs/heads/master: 8aadff7dd519800ce7c0e7fb75dcd4438b373134 diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig index e382f32d435e..dfd904f6883b 100644 --- a/trunk/arch/i386/Kconfig +++ b/trunk/arch/i386/Kconfig @@ -1163,7 +1163,7 @@ config PCI_DIRECT config PCI_MMCONFIG bool - depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI)) + depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) select ACPI_BOOT default y diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig index 82cb2a3f127a..0f430d9d3632 100644 --- a/trunk/arch/x86_64/Kconfig +++ b/trunk/arch/x86_64/Kconfig @@ -421,7 +421,7 @@ config PCI_DIRECT config PCI_MMCONFIG bool "Support mmconfig PCI config space access" - depends on PCI + depends on PCI && ACPI select ACPI_BOOT config UNORDERED_IO