diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-06-04 00:40:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-04 00:40:40 -0400 |
| commit | ae20ea8525a80a863f70d332cf47b71bd9f54c1f (patch) | |
| tree | 9d3cedeb65db521a8436b545bd91641549a18d24 /include/linux/acpi.h | |
| parent | f497ba735fc9ff4e35a19641143708b3be1c7061 (diff) | |
| parent | 8be3de3fd8469154a2b3e18a4712032dac5b4a53 (diff) | |
Automatic merge of /spare/repo/linux-2.6/.git branch HEAD
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index aefe6d051ace..d5a55bdb9c3c 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 | #ifdef CONFIG_ACPI | ||
| 29 | |||
| 28 | #ifndef _LINUX | 30 | #ifndef _LINUX |
| 29 | #define _LINUX | 31 | #define _LINUX |
| 30 | #endif | 32 | #endif |
| @@ -533,4 +535,5 @@ static inline int acpi_get_pxm(acpi_handle handle) | |||
| 533 | 535 | ||
| 534 | extern int pnpacpi_disabled; | 536 | extern int pnpacpi_disabled; |
| 535 | 537 | ||
| 536 | #endif /*_LINUX_ACPI_H*/ | 538 | #endif /* CONFIG_ACPI */ |
| 539 | #endif /*_LINUX_ACPI_H*/ | ||