lkml.org 
[lkml]   [2010]   [May]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[06/34] ACPI: sleep: eliminate duplicate entries in acpisleep_dmi_table[]
    2.6.34-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Alex Chiang <achiang@canonical.com>

    commit 7d6fb7bd1919517937ec390f6ca2d7bcf4f89fb6 upstream.

    Duplicate entries ended up acpisleep_dmi_table[] by accident.
    They don't hurt functionality, but they are ugly, so let's get
    rid of them.

    Signed-off-by: Alex Chiang <achiang@canonical.com>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/acpi/sleep.c | 90 ---------------------------------------------------
    1 file changed, 1 insertion(+), 89 deletions(-)

    --- a/drivers/acpi/sleep.c
    +++ b/drivers/acpi/sleep.c
    @@ -475,101 +475,13 @@ static struct dmi_system_id __initdata a
    },
    {
    .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad X201",
    + .ident = "Lenovo ThinkPad X201[s]",
    .matches = {
    DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
    },
    },
    {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad X201",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad T410",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad T510",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad W510",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad X201",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad X201",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad T410",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T410"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad T510",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad T510"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad W510",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad W510"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad X201",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201"),
    - },
    - },
    - {
    - .callback = init_set_sci_en_on_resume,
    - .ident = "Lenovo ThinkPad X201",
    - .matches = {
    - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
    - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad X201s"),
    - },
    - },
    - {
    .callback = init_old_suspend_ordering,
    .ident = "Panasonic CF51-2L",
    .matches = {



    \
     
     \ /
      Last update: 2010-05-25 01:19    [W:3.207 / U:0.856 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site