diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-05-06 06:23:59 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-05-06 06:26:35 +0200 |
| commit | 1222e564cf4394af0b3c5e8a73330b20862c068b (patch) | |
| tree | 3ce498996ed464c201b4e9654bfaa27d19ff4a4e | |
| parent | 5198b44374adb3f6143459a03c37f103f8a09548 (diff) | |
| download | op-kernel-dev-1222e564cf4394af0b3c5e8a73330b20862c068b.zip op-kernel-dev-1222e564cf4394af0b3c5e8a73330b20862c068b.tar.gz | |
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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
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. |
