From 0d73570d28371884bb665ba0dad42aa6a57d6de0 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 3 Sep 2014 12:37:04 +0200 Subject: Update kernel source and configs to v3.17-rc3. Signed-off-by: aszlig --- machines/dnyarri-kconf.nix | 4 ++++ machines/mmrnmhrm-kconf.nix | 4 ++++ 2 files changed, 8 insertions(+) (limited to 'machines') 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"; -- cgit 1.4.1