From 58759b58f6fdb3a530603a5831f7f4cfb146b410 Mon Sep 17 00:00:00 2001 From: Shaohua Li Date: Thu, 28 Jul 2011 13:48:43 -0700 Subject: [PATCH] --- yaml --- r: 262287 b: refs/heads/master c: aa165971c2923d05988f920c978e438dbc7b0de6 h: refs/heads/master i: 262285: af2fc141bcdb2593bda813412c6f18640eee528d 262283: 0885fd601868d72025f7d4041246dbfd9302997b 262279: 9be41e64acb6f2c3af44428feb4f9d251c3c015b 262271: 38b4dff722e11446ddbc7859e5410e2be6364b31 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/osl.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e9cd7a216aa9..106713f62ab4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f52e00c668669c9c290e84adf859c76db6d92a5a +refs/heads/master: aa165971c2923d05988f920c978e438dbc7b0de6 diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c index 372f9b70f7f4..0e4785703d45 100644 --- a/trunk/drivers/acpi/osl.c +++ b/trunk/drivers/acpi/osl.c @@ -1083,7 +1083,13 @@ struct osi_setup_entry { bool enable; }; -static struct osi_setup_entry __initdata osi_setup_entries[OSI_STRING_ENTRIES_MAX]; +static struct osi_setup_entry __initdata + osi_setup_entries[OSI_STRING_ENTRIES_MAX] = { + {"Module Device", true}, + {"Processor Device", true}, + {"3.0 _SCP Extensions", true}, + {"Processor Aggregator Device", true}, +}; void __init acpi_osi_setup(char *str) {