diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-11 05:44:30 -0400 |
| commit | 4a1032faac94ebbf647460ae3e06fc21146eb280 (patch) | |
| tree | 7f31b97beb0406faa1523e619289ad0ab07c9787 /fs/udf | |
| parent | ae4e8d63b5619d4d95f1d2bfa2b836caa6e62d06 (diff) | |
| parent | 0eddb519b9127c73d53db4bf3ec1d45b13f844d1 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'fs/udf')
| -rw-r--r-- | fs/udf/partition.c | 1 | ||||
| -rw-r--r-- | fs/udf/symlink.c | 1 | ||||
| -rw-r--r-- | fs/udf/unicode.c | 1 |
3 files changed, 1 insertions, 2 deletions
diff --git a/fs/udf/partition.c b/fs/udf/partition.c index 4b540ee632d5..745eb209be0c 100644 --- a/fs/udf/partition.c +++ b/fs/udf/partition.c | |||
| @@ -24,7 +24,6 @@ | |||
| 24 | 24 | ||
| 25 | #include <linux/fs.h> | 25 | #include <linux/fs.h> |
| 26 | #include <linux/string.h> | 26 | #include <linux/string.h> |
| 27 | #include <linux/slab.h> | ||
| 28 | #include <linux/buffer_head.h> | 27 | #include <linux/buffer_head.h> |
| 29 | 28 | ||
| 30 | uint32_t udf_get_pblock(struct super_block *sb, uint32_t block, | 29 | uint32_t udf_get_pblock(struct super_block *sb, uint32_t block, |
diff --git a/fs/udf/symlink.c b/fs/udf/symlink.c index 852e91845688..16064787d2b7 100644 --- a/fs/udf/symlink.c +++ b/fs/udf/symlink.c | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | #include <linux/time.h> | 26 | #include <linux/time.h> |
| 27 | #include <linux/mm.h> | 27 | #include <linux/mm.h> |
| 28 | #include <linux/stat.h> | 28 | #include <linux/stat.h> |
| 29 | #include <linux/slab.h> | ||
| 30 | #include <linux/pagemap.h> | 29 | #include <linux/pagemap.h> |
| 31 | #include <linux/smp_lock.h> | 30 | #include <linux/smp_lock.h> |
| 32 | #include <linux/buffer_head.h> | 31 | #include <linux/buffer_head.h> |
diff --git a/fs/udf/unicode.c b/fs/udf/unicode.c index cefa8c8913e6..d03a90b6ad69 100644 --- a/fs/udf/unicode.c +++ b/fs/udf/unicode.c | |||
| @@ -24,6 +24,7 @@ | |||
| 24 | #include <linux/string.h> /* for memset */ | 24 | #include <linux/string.h> /* for memset */ |
| 25 | #include <linux/nls.h> | 25 | #include <linux/nls.h> |
| 26 | #include <linux/crc-itu-t.h> | 26 | #include <linux/crc-itu-t.h> |
| 27 | #include <linux/slab.h> | ||
| 27 | 28 | ||
| 28 | #include "udf_sb.h" | 29 | #include "udf_sb.h" |
| 29 | 30 | ||