Merge branch 'acpi-config' into acpica

Conflicts:
	include/acpi/platform/aclinux.h
This commit is contained in:
Rafael J. Wysocki 2014-03-18 01:53:28 +01:00
commit bcef50814c
8 changed files with 20 additions and 19 deletions

View file

@ -54,6 +54,12 @@
#define ACPI_USE_SYSTEM_INTTYPES
/* Compile for reduced hardware mode only with this kernel config */
#ifdef CONFIG_ACPI_REDUCED_HARDWARE_ONLY
#define ACPI_REDUCED_HARDWARE 1
#endif
#include <linux/string.h>
#include <linux/kernel.h>
#include <linux/ctype.h>