From d2918797bb65dfdb8c1919db39af0ffea517ede5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 28 Oct 2015 11:09:59 +0100
Subject: [PATCH] linux: Fix i686 build

---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4df1e4e1938..62138fb58ab 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -488,8 +488,10 @@ with stdenv.lib;
   BRCMFMAC_PCIE? y
 
   # Support x2APIC (which requires IRQ remapping).
-  X86_X2APIC y
-  IRQ_REMAP y
+  ${optionalString (stdenv.system == "x86_64-linux") ''
+    X86_X2APIC y
+    IRQ_REMAP y
+  ''}
 
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}