diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-05-11 08:44:31 -0400 |
| commit | 41fb454ebe6024f5c1e3b3cbc0abc0da762e7b51 (patch) | |
| tree | 51c50bcb67a5039448ddfa1869d7948cab1217e9 /drivers/md/dm-linear.c | |
| parent | 19c1a6f5764d787113fa323ffb18be7991208f82 (diff) | |
| parent | 091bf7624d1c90cec9e578a18529f615213ff847 (diff) | |
Merge commit 'v2.6.30-rc5' into core/iommu
Merge reason: core/iommu was on an .30-rc1 base,
update it to .30-rc5 to refresh.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/md/dm-linear.c')
| -rw-r--r-- | drivers/md/dm-linear.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c index bfa107f59d96..79fb53e51c70 100644 --- a/drivers/md/dm-linear.c +++ b/drivers/md/dm-linear.c | |||
| @@ -142,7 +142,6 @@ static struct target_type linear_target = { | |||
| 142 | .status = linear_status, | 142 | .status = linear_status, |
| 143 | .ioctl = linear_ioctl, | 143 | .ioctl = linear_ioctl, |
| 144 | .merge = linear_merge, | 144 | .merge = linear_merge, |
| 145 | .features = DM_TARGET_SUPPORTS_BARRIERS, | ||
| 146 | }; | 145 | }; |
| 147 | 146 | ||
| 148 | int __init dm_linear_init(void) | 147 | int __init dm_linear_init(void) |