diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-11 10:29:28 +0100 |
commit | 1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935 (patch) | |
tree | 12df0f2e25e95654156b2900bd6df1abb3c2e87a /include/linux/ata.h | |
parent | 3a450de1365d20afde406f0d9b2931a5e4a4fd6a (diff) | |
parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) | |
download | linux-next-1d8ce7bc4d05b4a5c04dc17f92fef26989fb5935.tar.gz |
Merge branch 'linus' into core/percpu
Conflicts:
arch/x86/include/asm/fixmap_64.h
Diffstat (limited to 'include/linux/ata.h')
-rw-r--r-- | include/linux/ata.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/ata.h b/include/linux/ata.h index 08a86d5cdf1b..9a061accd8b8 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h @@ -89,6 +89,8 @@ enum { ATA_ID_DLF = 128, ATA_ID_CSFO = 129, ATA_ID_CFA_POWER = 160, + ATA_ID_CFA_KEY_MGMT = 162, + ATA_ID_CFA_MODES = 163, ATA_ID_ROT_SPEED = 217, ATA_ID_PIO4 = (1 << 1), |