diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 23:22:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-08-14 23:22:45 +0200 |
| commit | f3ce717e60572421f56d89c9a85ac42e634d16e7 (patch) | |
| tree | 46b85329773c7908378f90e4e8e86205ebfd229f /drivers/acpi/osl.c | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
| parent | e73d3136355f511d3e1c2ef21acf02b19bd2b650 (diff) | |
Merge back earlier 'acpi-assorted' material
Diffstat (limited to 'drivers/acpi/osl.c')
| -rw-r--r-- | drivers/acpi/osl.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 6ab2c350552..eb95978854a 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -52,6 +52,7 @@ #include <acpi/acpi.h> #include <acpi/acpi_bus.h> #include <acpi/processor.h> +#include "internal.h" #define _COMPONENT ACPI_OS_SERVICES ACPI_MODULE_NAME("osl"); @@ -1351,8 +1352,8 @@ struct osi_setup_entry { bool enable; }; -static struct osi_setup_entry __initdata - osi_setup_entries[OSI_STRING_ENTRIES_MAX] = { +static struct osi_setup_entry + osi_setup_entries[OSI_STRING_ENTRIES_MAX] __initdata = { {"Module Device", true}, {"Processor Device", true}, {"3.0 _SCP Extensions", true}, |