diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2007-07-23 05:20:10 -0400 |
| commit | 39fe5434cb9de5da40510028b17b96bc4eb312b3 (patch) | |
| tree | 7a02a317b9ad57da51ca99887c119e779ccf3f13 /include/acpi/platform/acenv.h | |
| parent | 0fc72b81d3111d114ab378935b1cf07680ca1289 (diff) | |
| parent | f695baf2df9e0413d3521661070103711545207a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/acpi/platform/acenv.h')
| -rw-r--r-- | include/acpi/platform/acenv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/acpi/platform/acenv.h b/include/acpi/platform/acenv.h index dab2ec59a3b0..c785485e62a6 100644 --- a/include/acpi/platform/acenv.h +++ b/include/acpi/platform/acenv.h | |||
| @@ -136,7 +136,7 @@ | |||
| 136 | 136 | ||
| 137 | /*! [Begin] no source code translation */ | 137 | /*! [Begin] no source code translation */ |
| 138 | 138 | ||
| 139 | #if defined(__linux__) | 139 | #if defined(_LINUX) || defined(__linux__) |
| 140 | #include "aclinux.h" | 140 | #include "aclinux.h" |
| 141 | 141 | ||
| 142 | #elif defined(_AED_EFI) | 142 | #elif defined(_AED_EFI) |