aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-05-06 00:23:59 -0400
committerIngo Molnar <mingo@kernel.org>2015-05-06 00:26:35 -0400
commit1222e564cf4394af0b3c5e8a73330b20862c068b (patch)
tree3ce498996ed464c201b4e9654bfaa27d19ff4a4e
parent5198b44374adb3f6143459a03c37f103f8a09548 (diff)
x86/platform/uv: Make SGI UV dependent on CONFIG_PCI
Recent PCI changes stopped exporting PCI constants if !CONFIG_PCI, which made the UV build fail: arch/x86/kernel/apic/x2apic_uv_x.c:843:16: error: ‘PCI_VGA_STATE_CHANGE_BRIDGE’ undeclared (first use in this function) arch/x86/kernel/apic/x2apic_uv_x.c:1023:2: error: implicit declaration of function ‘pci_register_set_vga_state’ [-Werror=implicit-function-declaration] As it's unlikely that an UV bootup will get far without PCI enumeration, make the platform Kconfig switch (CONFIG_X86_UV) depend on CONFIG_PCI=y. Cc: Robin Holt <holt@sgi.com> Cc: Dimitri Sivanich <sivanich@sgi.com> Cc: Russ Anderson <rja@sgi.com> Cc: Mike Travis <travis@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Signed-off-by: Ingo Molnar <mingo@kernel.org>
-rw-r--r--arch/x86/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 226d5696e1d1..066d9bdc5496 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -441,6 +441,7 @@ config X86_UV
441 depends on X86_EXTENDED_PLATFORM 441 depends on X86_EXTENDED_PLATFORM
442 depends on NUMA 442 depends on NUMA
443 depends on X86_X2APIC 443 depends on X86_X2APIC
444 depends on PCI
444 ---help--- 445 ---help---
445 This option is needed in order to support SGI Ultraviolet systems. 446 This option is needed in order to support SGI Ultraviolet systems.
446 If you don't have one of these, you should say N here. 447 If you don't have one of these, you should say N here.