diff options
| author | Jens Axboe <axboe@kernel.dk> | 2011-10-24 10:24:38 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-24 10:24:38 -0400 |
| commit | 83157223defe3be490cfea048e83451b6f254216 (patch) | |
| tree | fa484185d27765a13036bb43ae68d8cdb63f585b /include/linux | |
| parent | 9562ad9ab36df7ccef920d119f3b5100025db95f (diff) | |
| parent | f992ae801a7dec34a4ed99a6598bbbbfb82af4fb (diff) | |
Merge branch 'for-linus' into for-3.2/core
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/loop.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h index 683d69890119..a06880689115 100644 --- a/include/linux/loop.h +++ b/include/linux/loop.h | |||
| @@ -73,7 +73,6 @@ struct loop_device { | |||
| 73 | */ | 73 | */ |
| 74 | enum { | 74 | enum { |
| 75 | LO_FLAGS_READ_ONLY = 1, | 75 | LO_FLAGS_READ_ONLY = 1, |
| 76 | LO_FLAGS_USE_AOPS = 2, | ||
| 77 | LO_FLAGS_AUTOCLEAR = 4, | 76 | LO_FLAGS_AUTOCLEAR = 4, |
| 78 | }; | 77 | }; |
| 79 | 78 | ||