From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 18 Mar 2014 00:53:28 +0000 (+0100)
Subject: Merge branch 'acpi-config' into acpica
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=bcef50814c9de8e0672d3e7f9f1abd85e1b95d13;p=deliverable%2Flinux.git

Merge branch 'acpi-config' into acpica

Conflicts:
	include/acpi/platform/aclinux.h
---

bcef50814c9de8e0672d3e7f9f1abd85e1b95d13
diff --cc include/acpi/platform/aclinux.h
index 1ab66659f904,30c9a7c1af88..93c55ed7c53d
--- a/include/acpi/platform/aclinux.h
+++ b/include/acpi/platform/aclinux.h
@@@ -52,8 -52,12 +52,14 @@@
  
  #ifdef __KERNEL__
  
 +#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>