about summary refs log tree commit diff
path: root/nixos/modules/system
diff options
context:
space:
mode:
authorShea Levy <shea@shealevy.com>2014-04-21 07:51:31 -0400
committerShea Levy <shea@shealevy.com>2014-04-21 07:51:31 -0400
commit1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1 (patch)
treec3e46902382239adb8baf586b4b0eba1e8957bba /nixos/modules/system
parentb12b180fc28ae8de527dc1831f27607d1b255269 (diff)
parentca7978a09d9678556dfc91fc93b876369cd43de7 (diff)
downloadnixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.tar
nixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.tar.gz
nixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.tar.bz2
nixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.tar.lz
nixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.tar.xz
nixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.tar.zst
nixlib-1c5d3c78831b5d1aee3b46c2e5cabe7af14bc1d1.zip
Merge branch 'modulesfix' of git://github.com/kirelagin/nixpkgs
ohci_pci is required in initrd since kernel 3.11
Diffstat (limited to 'nixos/modules/system')
-rw-r--r--nixos/modules/system/boot/kernel.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index b81bcf20f439..9beb7fabce12 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -191,6 +191,7 @@ in
         "ehci_hcd"
         "ehci_pci"
         "ohci_hcd"
+        "ohci_pci"
         "xhci_hcd"
         "usbhid"
         "hid_generic"