From 20214bd8d2ca20a8a15d7092ca495881fce9daf1 Mon Sep 17 00:00:00 2001
From: Josh Boyer <jwboyer@fedoraproject.org>
Date: Tue, 17 Dec 2013 10:01:07 -0500
Subject: [PATCH] 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.
---
 acpi-sony-nonvs-blacklist.patch | 38 ---------------------------------
 kernel.spec                     |  3 +--
 2 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 acpi-sony-nonvs-blacklist.patch

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"),
diff --git a/kernel.spec b/kernel.spec
index 8bff14d2b..b60ae5e45 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -644,8 +644,8 @@ Patch100: taint-vbox.patch
 Patch110: vmbugon-warnon.patch
 
 Patch390: defaults-acpi-video.patch
+
 Patch394: acpi-debug-infinite-loop.patch
-Patch396: acpi-sony-nonvs-blacklist.patch
 
 Patch450: input-kill-stupid-messages.patch
 Patch452: no-pcspkr-modalias.patch
@@ -1416,7 +1416,6 @@ ApplyPatch arm-tegra-usb-no-reset-linux33.patch
 # ACPI
 ApplyPatch defaults-acpi-video.patch
 ApplyPatch acpi-debug-infinite-loop.patch
-ApplyPatch acpi-sony-nonvs-blacklist.patch
 
 #
 # PCI