From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Tue, 27 Nov 2012 12:42:42 +0000 (+0100)
Subject: Merge branch 'acpi-dev-pm' into acpi-enumeration
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=45c36462aef0cccadb7755ea4edc78d13334a2be;p=linux.git

Merge branch 'acpi-dev-pm' into acpi-enumeration

Subsequent commits in this branch will depend on 'acpi-dev-pm'
material.
---

45c36462aef0cccadb7755ea4edc78d13334a2be
diff --cc include/linux/acpi.h
index 32fbc4e73a561,28ba643c92c15..3574e4a2bf148
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@@ -25,8 -25,8 +25,9 @@@
  #ifndef _LINUX_ACPI_H
  #define _LINUX_ACPI_H
  
+ #include <linux/errno.h>
  #include <linux/ioport.h>	/* for struct resource */
 +#include <linux/device.h>
  
  #ifdef	CONFIG_ACPI