diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-22 14:05:19 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-22 14:05:19 -0500 |
| commit | fc6fc7f1b1095b92d4834e69b385b91e412a7ce5 (patch) | |
| tree | 2ad451d5dac4d460830536944cef1de93be36b2a /drivers/block/aoe/aoe.h | |
| parent | ef1f87aa7ba6224bef1b750b3272ba281d8f43ed (diff) | |
| parent | 770824bdc421ff58a64db608294323571c949f4c (diff) | |
Merge branch 'linus' into x86/apic
Conflicts:
arch/x86/mach-default/setup.c
Semantic conflict resolution:
arch/x86/kernel/setup.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/block/aoe/aoe.h')
| -rw-r--r-- | drivers/block/aoe/aoe.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h index c237527b1aa5..5e41e6dd657b 100644 --- a/drivers/block/aoe/aoe.h +++ b/drivers/block/aoe/aoe.h | |||
| @@ -18,6 +18,7 @@ | |||
| 18 | enum { | 18 | enum { |
| 19 | AOECMD_ATA, | 19 | AOECMD_ATA, |
| 20 | AOECMD_CFG, | 20 | AOECMD_CFG, |
| 21 | AOECMD_VEND_MIN = 0xf0, | ||
| 21 | 22 | ||
| 22 | AOEFL_RSP = (1<<3), | 23 | AOEFL_RSP = (1<<3), |
| 23 | AOEFL_ERR = (1<<2), | 24 | AOEFL_ERR = (1<<2), |