diff --git a/[refs] b/[refs] index 02cee60489ff..70e59471c1d0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c9626bade13de3f160f0926455328650045d6cd +refs/heads/master: 987c21a0b0081d480ec3cd04875509cdc10e15e7 diff --git a/trunk/include/acpi/acmacros.h b/trunk/include/acpi/acmacros.h index 192fa095a515..9b2e4d7154a4 100644 --- a/trunk/include/acpi/acmacros.h +++ b/trunk/include/acpi/acmacros.h @@ -55,6 +55,7 @@ #define ACPI_SET_BIT(target,bit) ((target) |= (bit)) #define ACPI_CLEAR_BIT(target,bit) ((target) &= ~(bit)) #define ACPI_MIN(a,b) (((a)<(b))?(a):(b)) +#define ACPI_MAX(a,b) (((a)>(b))?(a):(b)) /* Size calculation */