Commit 1222e564 authored by Ingo Molnar's avatar Ingo Molnar

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: default avatarIngo Molnar <mingo@kernel.org>
parent 5198b443
...@@ -441,6 +441,7 @@ config X86_UV ...@@ -441,6 +441,7 @@ config X86_UV
depends on X86_EXTENDED_PLATFORM depends on X86_EXTENDED_PLATFORM
depends on NUMA depends on NUMA
depends on X86_X2APIC depends on X86_X2APIC
depends on PCI
---help--- ---help---
This option is needed in order to support SGI Ultraviolet systems. This option is needed in order to support SGI Ultraviolet systems.
If you don't have one of these, you should say N here. If you don't have one of these, you should say N here.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment