Commit-ID: 1222e564cf4394af0b3c5e8a73330b20862c068b Gitweb: http://git.kernel.org/tip/1222e564cf4394af0b3c5e8a73330b20862c068b Author: Ingo Molnar <mingo@xxxxxxxxxx> AuthorDate: Wed, 6 May 2015 06:23:59 +0200 Committer: Ingo Molnar <mingo@xxxxxxxxxx> CommitDate: Wed, 6 May 2015 06:26:35 +0200 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@xxxxxxx> Cc: Dimitri Sivanich <sivanich@xxxxxxx> Cc: Russ Anderson <rja@xxxxxxx> Cc: Mike Travis <travis@xxxxxxx> Cc: Jack Steiner <steiner@xxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> --- arch/x86/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 226d569..066d9bd 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -441,6 +441,7 @@ config X86_UV depends on X86_EXTENDED_PLATFORM depends on NUMA depends on X86_X2APIC + depends on PCI ---help--- This option is needed in order to support SGI Ultraviolet systems. If you don't have one of these, you should say N here. -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|