diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-25 23:39:25 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-25 23:39:25 +0200 |
| commit | 17e8d03c485931b198fd24b69d19247053f58626 (patch) | |
| tree | e8d02dd022fae645e1d1d71d8f93e742b62a22e3 /arch/x86/kernel | |
| parent | e37f14a5fb85522f3bbf88ece6134c4e610ed598 (diff) | |
| parent | 5e2be4e0edff4a1021b6743ca6859129cd8e7067 (diff) | |
Merge back earlier 'acpi-assorted' material.
Diffstat (limited to 'arch/x86/kernel')
| -rw-r--r-- | arch/x86/kernel/acpi/boot.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 40c76604199f..d00db60a5e04 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -745,7 +745,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table) #ifdef CONFIG_HPET_TIMER #include <asm/hpet.h> -static struct __initdata resource *hpet_res; +static struct resource *hpet_res __initdata; static int __init acpi_parse_hpet(struct acpi_table_header *table) { |