diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 14:20:44 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-15 14:20:44 +0400 |
| commit | 08229de4b42816079ed5d15f0689fcd0af946d5e (patch) | |
| tree | 7126dc7b220fbbce745cb5d9a8864e9690587da4 /include/linux/loop.h | |
| parent | fbb474dedab871c7382858c374acd287dad4ab38 (diff) | |
| parent | 2a708137fd7d3e0928f27157aaed8aba404b11c9 (diff) | |
| download | linux-08229de4b42816079ed5d15f0689fcd0af946d5e.tar.xz | |
Merge branch 'for-2.6.32' into mxc
Conflicts:
sound/soc/Makefile
Diffstat (limited to 'include/linux/loop.h')
| -rw-r--r-- | include/linux/loop.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 40725447f5e0..66c194e2d9b9 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h @@ -56,8 +56,7 @@ struct loop_device { gfp_t old_gfp_mask; spinlock_t lo_lock; - struct bio *lo_bio; - struct bio *lo_biotail; + struct bio_list lo_bio_list; int lo_state; struct mutex lo_ctl_mutex; struct task_struct *lo_thread; |