diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 21:06:06 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-05 21:06:06 +0400 |
| commit | 59068e369b6a2a0a15b93624887525d9ec0f36e5 (patch) | |
| tree | 7d165bb50d379e37ca7f0b3fed5da9f7719e22e4 /include | |
| parent | 377485f6244af255b04d662cf19cddbbc4ae4310 (diff) | |
| parent | 1cc0c998fdf2cb665d625fb565a0d6db5c81c639 (diff) | |
| download | linux-59068e369b6a2a0a15b93624887525d9ec0f36e5.tar.xz | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull an ACPI patch from Len Brown:
"It fixes a D3 issue new in 3.4-rc1."
By Lin Ming via Len Brown:
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
ACPI: Fix D3hot v D3cold confusion
Diffstat (limited to 'include')
| -rw-r--r-- | include/acpi/actypes.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index eba66043cf1b..e8bcc4742e0e 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -499,9 +499,10 @@ typedef u64 acpi_integer; #define ACPI_STATE_D0 (u8) 0 #define ACPI_STATE_D1 (u8) 1 #define ACPI_STATE_D2 (u8) 2 -#define ACPI_STATE_D3 (u8) 3 -#define ACPI_STATE_D3_COLD (u8) 4 -#define ACPI_D_STATES_MAX ACPI_STATE_D3_COLD +#define ACPI_STATE_D3_HOT (u8) 3 +#define ACPI_STATE_D3 (u8) 4 +#define ACPI_STATE_D3_COLD ACPI_STATE_D3 +#define ACPI_D_STATES_MAX ACPI_STATE_D3 #define ACPI_D_STATE_COUNT 5 #define ACPI_STATE_C0 (u8) 0 |