From 5ac00265a8ef7dd2f3e1bd00aa1b17b5779b8633 Mon Sep 17 00:00:00 2001
From: Heitham Omar <hhomar@gmail.com>
Date: Sun, 6 Aug 2017 16:15:30 +0100
Subject: [PATCH] linux-common-config: add CONFIG_HOTPLUG_PCI_ACPI

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 5e2b1d610e7..c0ee75ae9f8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -450,8 +450,11 @@ with stdenv.lib;
   X86_CHECK_BIOS_CORRUPTION y
   X86_MCE y
 
-  # PCI-Expresscard hotplug support
-  ${optionalString (versionAtLeast version "3.12") "HOTPLUG_PCI_PCIE y"}
+  ${optionalString (versionAtLeast version "3.12") ''
+    HOTPLUG_PCI_ACPI y # PCI hotplug using ACPI
+    HOTPLUG_PCI_PCIE y # PCI-Expresscard hotplug support
+  ''}
+
 
   # Linux containers.
   NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'