The patch titled
acpi: sleep: init_set_sci_en_on_resume for Dell Studio 155x
has been removed from the -mm tree. Its filename was
acpi-sleep-init_set_sci_en_on_resume-for-dell-studio-155x.patch
This patch was dropped because other changes were merged, which wrecked this patch
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: acpi: sleep: init_set_sci_en_on_resume for Dell Studio 155x
From: Kamal Mostafa <kamal@xxxxxxxxxxxxx>
Add Dell Studio models (1558, 1557, 1555) to the 'set_sci_en_on_resume'
list to fix hang on resume.
Addresses http://bugs.launchpad.net/bugs/553498
Signed-off-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx>
Acked-by: Alex Chiang <achiang@xxxxxxxxxxxxx>
Cc: Len Brown <lenb@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/sleep.c | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff -puN drivers/acpi/sleep.c~acpi-sleep-init_set_sci_en_on_resume-for-dell-studio-155x drivers/acpi/sleep.c
--- a/drivers/acpi/sleep.c~acpi-sleep-init_set_sci_en_on_resume-for-dell-studio-155x
+++ a/drivers/acpi/sleep.c
@@ -588,6 +588,30 @@ static struct dmi_system_id __initdata a
DMI_MATCH(DMI_BOARD_NAME, "CF51-2L"),
},
},
+ {
+ .callback = init_set_sci_en_on_resume,
+ .ident = "Dell Studio 1558",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1558"),
+ },
+ },
+ {
+ .callback = init_set_sci_en_on_resume,
+ .ident = "Dell Studio 1557",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1557"),
+ },
+ },
+ {
+ .callback = init_set_sci_en_on_resume,
+ .ident = "Dell Studio 1555",
+ .matches = {
+ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+ DMI_MATCH(DMI_PRODUCT_NAME, "Studio 1555"),
+ },
+ },
{},
};
#endif /* CONFIG_SUSPEND */
_
Patches currently in -mm which might be from kamal@xxxxxxxxxxxxx are
acpi-sleep-init_set_sci_en_on_resume-for-dell-studio-155x.patch
acpi-video-fix-acpi_backlight=video.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
