diff options
| author | aszlig <aszlig@redmoonstudios.org> | 2014-09-03 12:37:04 +0200 |
|---|---|---|
| committer | aszlig <aszlig@redmoonstudios.org> | 2014-09-03 12:37:04 +0200 |
| commit | 0d73570d28371884bb665ba0dad42aa6a57d6de0 (patch) | |
| tree | 3287dc71a39799e8eaf4b1564f9cbb78f388ead1 /machines | |
| parent | 62e2dce98704681cafe67b06e18d3e5ffa037d88 (diff) | |
Update kernel source and configs to v3.17-rc3.
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'machines')
| -rw-r--r-- | machines/dnyarri-kconf.nix | 4 | ||||
| -rw-r--r-- | machines/mmrnmhrm-kconf.nix | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/machines/dnyarri-kconf.nix b/machines/dnyarri-kconf.nix index 84b0fc0b..091cc2c3 100644 --- a/machines/dnyarri-kconf.nix +++ b/machines/dnyarri-kconf.nix @@ -337,6 +337,7 @@ "CONFIG_HZ" = "1000"; "CONFIG_SCHED_HRTICK" = "y"; "CONFIG_KEXEC" = "y"; + "CONFIG_KEXEC_FILE" = "y"; "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; @@ -1014,6 +1015,9 @@ "CONFIG_USB_STORAGE_CYPRESS_ATACB" = "m"; "CONFIG_USB_STORAGE_ENE_UB6250" = "m"; "CONFIG_USB_UAS" = "m"; + "CONFIG_USBIP_CORE" = "m"; + "CONFIG_USBIP_VHCI_HCD" = "m"; + "CONFIG_USBIP_HOST" = "m"; "CONFIG_USB_SERIAL" = "y"; "CONFIG_USB_SERIAL_SIMPLE" = "m"; "CONFIG_USB_SERIAL_AIRCABLE" = "m"; diff --git a/machines/mmrnmhrm-kconf.nix b/machines/mmrnmhrm-kconf.nix index 9d698a1f..d4419208 100644 --- a/machines/mmrnmhrm-kconf.nix +++ b/machines/mmrnmhrm-kconf.nix @@ -335,6 +335,7 @@ "CONFIG_HZ" = "1000"; "CONFIG_SCHED_HRTICK" = "y"; "CONFIG_KEXEC" = "y"; + "CONFIG_KEXEC_FILE" = "y"; "CONFIG_PHYSICAL_START" = "0x1000000"; "CONFIG_PHYSICAL_ALIGN" = "0x1000000"; "CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG" = "y"; @@ -730,6 +731,9 @@ "CONFIG_USB_UAS" = "m"; "CONFIG_USB_MDC800" = "m"; "CONFIG_USB_MICROTEK" = "m"; + "CONFIG_USBIP_CORE" = "m"; + "CONFIG_USBIP_VHCI_HCD" = "m"; + "CONFIG_USBIP_HOST" = "m"; "CONFIG_USB_SERIAL" = "m"; "CONFIG_USB_SERIAL_GENERIC" = "y"; "CONFIG_USB_SERIAL_SIMPLE" = "m"; |