Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1738e3e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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
parents 43cdd1b7 9481a2c5

drivers/acpi/acpica/acapps.h

+2 −2
Original line number Diff line number Diff line
@@ -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
@@ -51,7 +51,7 @@ 
/* Common info for tool signons */



#define ACPICA_NAME                 "Intel ACPI Component Architecture"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2017 Intel Corporation"

#define ACPICA_COPYRIGHT            "Copyright (c) 2000 - 2018 Intel Corporation"



#if ACPI_MACHINE_WIDTH == 64

#define ACPI_WIDTH          " (64-bit version)"

drivers/acpi/acpica/accommon.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/acpica/acconvert.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/acpica/acdebug.h

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/acpi/acpica/acdispat.h

+1 −1
Original line number Diff line number Diff line
@@ -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