x86/Sandy Bridge: Sandy Bridge workaround depends on CONFIG_PCI

commit e43b3cec711a61edf047adf6204d542f3a659ef8 upstream.

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>
Signed-off-by: Abdallah Chatila <abdallah.chatila@ericsson.com>

diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index eb9eb8be17deba2afd4db9b67bc4748c2dc6a623..6c4e9ffc290c2bc0a874d2c9c18c09a2b3c5d54f 100644 (file)
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -633,6 +633,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 u16 snb_ids[] = {
@@ -657,6 +658,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;
 }