diff options
| author | David S. Miller <davem@davemloft.net> | 2015-07-14 03:28:09 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-07-14 03:28:09 +0300 |
| commit | 638d3c63811e31b2745f7fdd568b38c8abcffe03 (patch) | |
| tree | 606426ab4de84e59c5f50e1e3cce6e24819d45af /drivers/acpi/acpica/accommon.h | |
| parent | 74fe61f17e999a458d5f64ca2aa9a0282ca32198 (diff) | |
| parent | f760b87f8f12eb262f14603e65042996fe03720e (diff) | |
| download | linux-638d3c63811e31b2745f7fdd568b38c8abcffe03.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/bridge/br_mdb.c
Minor conflict in br_mdb.c, in 'net' we added a memset of the
on-stack 'ip' variable whereas in 'net-next' we assign a new
member 'vid'.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/acpi/acpica/accommon.h')
| -rw-r--r-- | drivers/acpi/acpica/accommon.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/acpi/acpica/accommon.h b/drivers/acpi/acpica/accommon.h index 853aa2dbdb61..a8d8092ee391 100644 --- a/drivers/acpi/acpica/accommon.h +++ b/drivers/acpi/acpica/accommon.h @@ -59,5 +59,8 @@ #include "acglobal.h" /* All global variables */ #include "achware.h" /* Hardware defines and interfaces */ #include "acutils.h" /* Utility interfaces */ +#ifndef ACPI_USE_SYSTEM_CLIBRARY +#include "acclib.h" /* C library interfaces */ +#endif /* !ACPI_USE_SYSTEM_CLIBRARY */ #endif /* __ACCOMMON_H__ */ |