diff options
| author | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-27 01:24:03 +0200 |
|---|---|---|
| committer | KalimochoAz <calimochoazucarado@gmail.com> | 2012-07-27 01:24:03 +0200 |
| commit | 3dfc3dfc7a13e46422f309fc03de421a765fb12c (patch) | |
| tree | b018f6713bbfd63937a23b40708c3fb764e62222 /arch/x86/include | |
| parent | 042098f2e54409eda6b7324277aabd31aa359e28 (diff) | |
| parent | ce05b1d31e57b7de6b814073e88bdd403ce71229 (diff) | |
| download | kernel_samsung_crespo-3dfc3dfc7a13e46422f309fc03de421a765fb12c.tar.gz kernel_samsung_crespo-3dfc3dfc7a13e46422f309fc03de421a765fb12c.tar.bz2 kernel_samsung_crespo-3dfc3dfc7a13e46422f309fc03de421a765fb12c.zip | |
Merge branch 'linux-3.0.y' into HEAD
Conflicts:
arch/arm/kernel/smp.c
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/cpufeature.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h index 71cc3800712..c5d941f08ba 100644 --- a/arch/x86/include/asm/cpufeature.h +++ b/arch/x86/include/asm/cpufeature.h @@ -173,7 +173,7 @@ #define X86_FEATURE_XSAVEOPT (7*32+ 4) /* Optimized Xsave */ #define X86_FEATURE_PLN (7*32+ 5) /* Intel Power Limit Notification */ #define X86_FEATURE_PTS (7*32+ 6) /* Intel Package Thermal Status */ -#define X86_FEATURE_DTS (7*32+ 7) /* Digital Thermal Sensor */ +#define X86_FEATURE_DTHERM (7*32+ 7) /* Digital Thermal Sensor */ /* Virtualization flags: Linux defined, word 8 */ #define X86_FEATURE_TPR_SHADOW (8*32+ 0) /* Intel TPR Shadow */ |