Merge branch 'acpi-config' into acpica

Conflicts:
	include/acpi/platform/aclinux.h

diff --cc include/acpi/platform/aclinux.h
index 1ab6665,30c9a7c..93c55ed
--- 1/include/acpi/platform/aclinux.h
--- 2/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>