From b13a486f24eb1efa5e9368cb5e00bc28379c5a82 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Mon, 7 Mar 2016 18:00:21 +0300
Subject: [PATCH] ChromiumOS kernel option fixup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

(cherry picked from commit 9d03355bedb392910f8cd3fcae5891f728c7051e)
Signed-off-by: Domen Kožar <domen@dev.si>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4de27fd3000d..f3dd32386bc9 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -478,6 +478,9 @@ with stdenv.lib;
   ''}
   ${optionalString (versionAtLeast version "3.7") ''
     MEDIA_USB_SUPPORT y
+    ${optionalString (!(features.chromiumos or false)) ''
+      MEDIA_PCI_SUPPORT y
+    ''}
   ''}
 
   # Our initrd init uses shebang scripts, so can't be modular.