diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 15:56:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 15:56:27 -0400 |
| commit | 45480aa75b03d6705ab5ceebda9d09be22f4e928 (patch) | |
| tree | e8314360d01e4f2cea3a926f0f7f7d856d57c3cb /fs/udf/file.c | |
| parent | 1fc7995d19139d6f99203b43c161968f3f554a15 (diff) | |
| parent | 581b7e9fc00789782cb3bdca58db49f6f0f66608 (diff) | |
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6
* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-udf-2.6:
udf: super.c Fix warning: variable 'sbi' set but not used
udf: remove duplicated #include
Diffstat (limited to 'fs/udf/file.c')
| -rw-r--r-- | fs/udf/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/udf/file.c b/fs/udf/file.c index 94e06d6bddbd..6e450e01a1bb 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/pagemap.h> | 36 | #include <linux/pagemap.h> |
| 37 | #include <linux/buffer_head.h> | 37 | #include <linux/buffer_head.h> |
| 38 | #include <linux/aio.h> | 38 | #include <linux/aio.h> |
| 39 | #include <linux/smp_lock.h> | ||
| 40 | 39 | ||
| 41 | #include "udf_i.h" | 40 | #include "udf_i.h" |
| 42 | #include "udf_sb.h" | 41 | #include "udf_sb.h" |