diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-06-02 11:39:11 -0400 |
| commit | 1c3f45ab2f7f879ea482501c83899505c31f7539 (patch) | |
| tree | 672465b3b9b3e2e26a8caf74ed64aa6885c52c13 /arch/i386/Kconfig | |
| parent | 4bcff1b37e7c3aed914d1ce5b45994adc7dbf455 (diff) | |
| parent | e0d6d71440a3a35c6fc2dde09f8e8d4d7bd44dda (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/i386/Kconfig')
| -rw-r--r-- | arch/i386/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig index e382f32d435e..dfd904f6883b 100644 --- a/arch/i386/Kconfig +++ b/arch/i386/Kconfig | |||
| @@ -1163,7 +1163,7 @@ config PCI_DIRECT | |||
| 1163 | 1163 | ||
| 1164 | config PCI_MMCONFIG | 1164 | config PCI_MMCONFIG |
| 1165 | bool | 1165 | bool |
| 1166 | depends on PCI && (PCI_GOMMCONFIG || (PCI_GOANY && ACPI)) | 1166 | depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY) |
| 1167 | select ACPI_BOOT | 1167 | select ACPI_BOOT |
| 1168 | default y | 1168 | default y |
| 1169 | 1169 | ||