diff options
| author | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
|---|---|---|
| committer | Steve French <sfrench@hera.kernel.org> | 2005-05-31 17:32:44 -0400 |
| commit | af6f5e3247a68074e384ef93c0b4bce1b73c9d80 (patch) | |
| tree | 87b0f1e48bd0ca67a78fab0fa42b37864863fdfd /include/linux/acpi.h | |
| parent | 7e2987503dda95a5f80290bb8c06279009c2419e (diff) | |
| parent | 2e3e80c2b75e3815a0160cbd23d4fdb767d66b35 (diff) | |
Merge with rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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*/ | ||