diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-18 13:21:24 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-18 13:21:24 -0400 |
| commit | f9d1fe9630b94007902987c39d19f04dc6256eac (patch) | |
| tree | 1fbe757adc72469ddbc3c1e4132392164b2e0271 /include/linux/acpi.h | |
| parent | 54258a8a2e81b11e486068f1cfab9fe4746b8420 (diff) | |
| parent | 9ee1c939d1cb936b1f98e8d81aeffab57bae46ab (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index d5a55bdb9c3c..b123cc08773d 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -25,6 +25,8 @@ | |||
| 25 | #ifndef _LINUX_ACPI_H | 25 | #ifndef _LINUX_ACPI_H |
| 26 | #define _LINUX_ACPI_H | 26 | #define _LINUX_ACPI_H |
| 27 | 27 | ||
| 28 | #include <linux/config.h> | ||
| 29 | |||
| 28 | #ifdef CONFIG_ACPI | 30 | #ifdef CONFIG_ACPI |
| 29 | 31 | ||
| 30 | #ifndef _LINUX | 32 | #ifndef _LINUX |