From: David Mosberger <davidm@napali.hpl.hp.com>

I'm not sure why this issue is suddenly showing, but without this
patchlet, the zx1 config won't compile anymore (e.g., to see the
compilation-error, look for "***" in [1]).

[1] http://www.gelato.unsw.edu.au/kerncomp/results//2005-06-06-17-00/zx1_defconfig-log.html

Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Cc: "Brown, Len" <len.brown@intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 include/linux/acpi.h |    2 ++
 1 files changed, 2 insertions(+)

diff -puN include/linux/acpi.h~include-linux-configh-before-testing-config_acpi include/linux/acpi.h
--- 25/include/linux/acpi.h~include-linux-configh-before-testing-config_acpi	Mon Jun  6 15:28:41 2005
+++ 25-akpm/include/linux/acpi.h	Mon Jun  6 15:28:41 2005
@@ -25,6 +25,8 @@
 #ifndef _LINUX_ACPI_H
 #define _LINUX_ACPI_H
 
+#include <linux/config.h>
+
 #ifdef	CONFIG_ACPI
 
 #ifndef _LINUX
_