diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2013-12-17 10:01:07 -0500 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2013-12-17 10:01:07 -0500 |
| commit | 6855069a2817b8c2e675996d31adde6d8e48231b (patch) | |
| tree | 87dd738dc1b45a7d2eb57ad79e6bce7d68cefb19 /acpi-sony-nonvs-blacklist.patch | |
| parent | fa204d55ead6b37ed558b95d7882399fe9e982ca (diff) | |
| download | kernel-6855069a2817b8c2e675996d31adde6d8e48231b.tar.gz kernel-6855069a2817b8c2e675996d31adde6d8e48231b.tar.xz kernel-6855069a2817b8c2e675996d31adde6d8e48231b.zip | |
Drop acpi-sony-nonvs-blacklist.patch
This still applies through some confounding patch magic, but the entries were
added to the upstream kernel with commits ddf6ce45a7b and d11c78e97e1d46a93e.
Over 2 years ago. Sigh.
Diffstat (limited to 'acpi-sony-nonvs-blacklist.patch')
| -rw-r--r-- | acpi-sony-nonvs-blacklist.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/acpi-sony-nonvs-blacklist.patch b/acpi-sony-nonvs-blacklist.patch deleted file mode 100644 index db500e8bf..000000000 --- a/acpi-sony-nonvs-blacklist.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c -index 3ed80b2..17fc718 100644 ---- a/drivers/acpi/sleep.c -+++ b/drivers/acpi/sleep.c -@@ -390,6 +390,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { - }, - { - .callback = init_nvs_nosave, -+ .ident = "Sony Vaio VGN-FW21E", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FW21E"), -+ }, -+ }, -+ { -+ .callback = init_nvs_nosave, - .ident = "Sony Vaio VGN-SR11M", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), -diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c -index 0e46fae..6d9a3ab 100644 ---- a/drivers/acpi/sleep.c -+++ b/drivers/acpi/sleep.c -@@ -398,6 +398,14 @@ static struct dmi_system_id __initdata acpisleep_dmi_table[] = { - }, - { - .callback = init_nvs_nosave, -+ .ident = "Sony Vaio VPCEB17FX", -+ .matches = { -+ DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), -+ DMI_MATCH(DMI_PRODUCT_NAME, "VPCEB17FX"), -+ }, -+ }, -+ { -+ .callback = init_nvs_nosave, - .ident = "Sony Vaio VGN-SR11M", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), |