diff options
author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/md | |
parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'drivers/md')
-rw-r--r-- | drivers/md/dm-crypt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index ed1038164019..e412980763bd 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c | |||
@@ -988,7 +988,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv) | |||
988 | goto bad_cipher; | 988 | goto bad_cipher; |
989 | } | 989 | } |
990 | 990 | ||
991 | /* Compatiblity mode for old dm-crypt cipher strings */ | 991 | /* Compatibility mode for old dm-crypt cipher strings */ |
992 | if (!chainmode || (strcmp(chainmode, "plain") == 0 && !ivmode)) { | 992 | if (!chainmode || (strcmp(chainmode, "plain") == 0 && !ivmode)) { |
993 | chainmode = "cbc"; | 993 | chainmode = "cbc"; |
994 | ivmode = "plain"; | 994 | ivmode = "plain"; |