diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-13 17:44:51 -0400 |
| commit | 97fb44eb6bc01f4ffed4300e475aa15e44877375 (patch) | |
| tree | 481ed6efd0babe7185cae04f2fd295426b36411d /drivers/block/aoe/aoe.h | |
| parent | e4707dd3e9d0cb57597b6568a5e51fea5d6fca41 (diff) | |
| parent | 148854c65ea8046b045672fd49f4333aefaa3ab5 (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel
Conflicts:
arch/arm/mach-at91/gpio.c
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), |