summary refs log tree commit diff
path: root/drivers/acpi/acpica/acresrc.h
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-08 11:26:07 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2018-02-08 11:26:07 +0100
commitb1738e3ebac570a647648a679a54c033813beb68 (patch)
tree2720050a1c88d085af74956c2f63c4c82cab3237 /drivers/acpi/acpica/acresrc.h
parent43cdd1b716b26f6af16da4e145b6578f98798bf6 (diff)
parent9481a2c5c1d9920938297e47509716fff43aa601 (diff)
downloadlinux-b1738e3ebac570a647648a679a54c033813beb68.tar.gz
Merge branch 'acpica'
* acpica:
  ACPICA: Update version to 20180105
  ACPICA: All acpica: Update copyrights to 2018
  ACPICA: Add a missing pair of parentheses
  ACPICA: Prefer ACPI_TO_POINTER() over ACPI_ADD_PTR()
  ACPICA: Avoid NULL pointer arithmetic
  ACPICA: Linux: add support for X32 ABI compilation
Diffstat (limited to 'drivers/acpi/acpica/acresrc.h')
-rw-r--r--drivers/acpi/acpica/acresrc.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/acpica/acresrc.h b/drivers/acpi/acpica/acresrc.h
index 438f3098a093..20f36949928a 100644
--- a/drivers/acpi/acpica/acresrc.h
+++ b/drivers/acpi/acpica/acresrc.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2017, Intel Corp.
+ * Copyright (C) 2000 - 2018, Intel Corp.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without