diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /include/linux/acpi.h | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/linux/acpi.h')
| -rw-r--r-- | include/linux/acpi.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index aefe6d051ace..b123cc08773d 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
| @@ -25,6 +25,10 @@ | |||
| 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 | |||
| 30 | #ifdef CONFIG_ACPI | ||
| 31 | |||
| 28 | #ifndef _LINUX | 32 | #ifndef _LINUX |
| 29 | #define _LINUX | 33 | #define _LINUX |
| 30 | #endif | 34 | #endif |
| @@ -533,4 +537,5 @@ static inline int acpi_get_pxm(acpi_handle handle) | |||
| 533 | 537 | ||
| 534 | extern int pnpacpi_disabled; | 538 | extern int pnpacpi_disabled; |
| 535 | 539 | ||
| 536 | #endif /*_LINUX_ACPI_H*/ | 540 | #endif /* CONFIG_ACPI */ |
| 541 | #endif /*_LINUX_ACPI_H*/ | ||