diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /block/blk.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk.h b/block/blk.h index c8db371a921d..61263463e38e 100644 --- a/block/blk.h +++ b/block/blk.h | |||
| @@ -32,7 +32,7 @@ enum rq_atomic_flags { | |||
| 32 | 32 | ||
| 33 | /* | 33 | /* |
| 34 | * EH timer and IO completion will both attempt to 'grab' the request, make | 34 | * EH timer and IO completion will both attempt to 'grab' the request, make |
| 35 | * sure that only one of them suceeds | 35 | * sure that only one of them succeeds |
| 36 | */ | 36 | */ |
| 37 | static inline int blk_mark_rq_complete(struct request *rq) | 37 | static inline int blk_mark_rq_complete(struct request *rq) |
| 38 | { | 38 | { |