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)
 {