From c08aa32c906efe746fc1ffb2bdb0c5b9464d4a51 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Sat, 27 Apr 2019 08:08:12 -0400 Subject: [PATCH] linux: Remove i2c-oops patch --- pkgs/os-specific/linux/kernel/i2c-oops.patch | 12 ------------ pkgs/os-specific/linux/kernel/patches.nix | 4 ---- 2 files changed, 16 deletions(-) delete mode 100644 pkgs/os-specific/linux/kernel/i2c-oops.patch diff --git a/pkgs/os-specific/linux/kernel/i2c-oops.patch b/pkgs/os-specific/linux/kernel/i2c-oops.patch deleted file mode 100644 index 2d4f25cec68..00000000000 --- a/pkgs/os-specific/linux/kernel/i2c-oops.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -index 1d645c9ab417bf..cac262a912c124 100644 ---- a/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -+++ b/drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c -@@ -337,7 +337,8 @@ static const struct dmi_system_id i2c_hid_dmi_desc_override_table[] = { - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "FlexBook edge11 - M-FBE11"), - }, - .driver_data = (void *)&sipodev_desc -- } -+ }, -+ { } /* Terminate list */ - }; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index e02cd0545a4..4c338b37dec 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -57,8 +57,4 @@ rec { sha256 = "1l8xq02rd7vakxg52xm9g4zng0ald866rpgm8kjlh88mwwyjkrwv"; }; }; - - # Fix kernel OOPS on boot: https://github.com/NixOS/nixpkgs/issues/60126 - # Remove with the next release. - i2c-oops = { name = "i2c-oops"; patch = ./i2c-oops.patch; }; }