diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-27 20:20:24 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-27 20:20:24 -0400 |
| commit | 5171f4fa744de840c2c20f5b65bd3ee1cd85d0e8 (patch) | |
| tree | 962c881be0b82b2cb973393d98a8a66153167afd /arch/x86/kernel | |
| parent | 975bcabb05436d8b99214a2293d1d5b9c0b0ca08 (diff) | |
| parent | b042453f3892465e8372b95a0f42c0890df03445 (diff) | |
Merge branch 'acpi-assorted'
* acpi-assorted:
ACPI: Add Toshiba NB100 to Vista _OSI blacklist
ACPI / osl: remove an unneeded NULL check
ACPI / platform: add ACPI ID for a Broadcom GPS chip
ACPI: improve acpi_extract_package() utility
ACPI / LPSS: fix UART Auto Flow Control
ACPI / platform: Add ACPI IDs for Intel SST audio device
x86 / ACPI: fix incorrect placement of __initdata tag
ACPI / thermal: convert printk(LEVEL...) to pr_<lvl>
ACPI / sysfs: make GPE sysfs attributes only accept correct values
ACPI / EC: Convert all printk() calls to dynamic debug function
ACPI / button: Using input_set_capability() to mark device's event capability
ACPI / osl: implement acpi_os_sleep() with msleep()
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 1f7c0746611f..6c0b43bd024b 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
| @@ -695,7 +695,7 @@ static int __init acpi_parse_sbf(struct acpi_table_header *table) | |||
| 695 | #ifdef CONFIG_HPET_TIMER | 695 | #ifdef CONFIG_HPET_TIMER |
| 696 | #include <asm/hpet.h> | 696 | #include <asm/hpet.h> |
| 697 | 697 | ||
| 698 | static struct __initdata resource *hpet_res; | 698 | static struct resource *hpet_res __initdata; |
| 699 | 699 | ||
| 700 | static int __init acpi_parse_hpet(struct acpi_table_header *table) | 700 | static int __init acpi_parse_hpet(struct acpi_table_header *table) |
| 701 | { | 701 | { |