diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-18 13:49:29 +0100 |
| commit | a090b22f3fafa9340f903834de87552b50c5f2ba (patch) | |
| tree | d07b55c9d60d585f8ceed2c8f43e8a04309fc67e /include/acpi/platform/aclinux.h | |
| parent | 0b3571274b8ff53c0e08bc667ecd3d8a43bd8714 (diff) | |
| parent | b43e1065cab4b5be90c016b2f076086b70cd1556 (diff) | |
Merge branch 'acpica' into acpi-lpss
The following commits depend on the 'acpica' material.
Diffstat (limited to 'include/acpi/platform/aclinux.h')
| -rw-r--r-- | include/acpi/platform/aclinux.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/acpi/platform/aclinux.h b/include/acpi/platform/aclinux.h index 85d5d8f3845..33d05b06c6e 100644 --- a/include/acpi/platform/aclinux.h +++ b/include/acpi/platform/aclinux.h @@ -108,7 +108,6 @@ #include <acpi/platform/acgcc.h> - #ifdef __KERNEL__ #include <acpi/actypes.h> /* |