From: H. Peter Anvin <hpa@linux.intel.com>
Date: Mon, 14 Jan 2013 04:56:41 +0000 (-0800)
Subject: x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e43b3cec711a61edf047adf6204d542f3a659ef8;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI

early_pci_allowed() and read_pci_config_16() are only available if
CONFIG_PCI is defined.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
---

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 18182d19b71b..00f6c1472b85 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -612,6 +612,7 @@ static unsigned reserve_low = CONFIG_X86_RESERVE_LOW << 10;
 
 static bool __init snb_gfx_workaround_needed(void)
 {
+#ifdef CONFIG_PCI
 	int i;
 	u16 vendor, devid;
 	static const __initconst u16 snb_ids[] = {
@@ -636,6 +637,7 @@ static bool __init snb_gfx_workaround_needed(void)
 	for (i = 0; i < ARRAY_SIZE(snb_ids); i++)
 		if (devid == snb_ids[i])
 			return true;
+#endif
 
 	return false;
 }