diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-11-09 17:33:22 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-11-09 17:33:22 -0500 |
| commit | e82b3aec8d508d2a925a4c766e97f16b7c4dfb1b (patch) | |
| tree | 69d5685ef0c194f651a03e30bff14628b4d45400 /fs/hfsplus/super.c | |
| parent | ec58ef03284f0bfa50a04982b74c8c2325a0758e (diff) | |
| parent | ad8f76be48d817b48222411ae16a7dfe257bdb24 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'fs/hfsplus/super.c')
| -rw-r--r-- | fs/hfsplus/super.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 452fc1fdbd32..0ce1c455ae55 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c | |||
| @@ -14,7 +14,6 @@ | |||
| 14 | #include <linux/fs.h> | 14 | #include <linux/fs.h> |
| 15 | #include <linux/sched.h> | 15 | #include <linux/sched.h> |
| 16 | #include <linux/slab.h> | 16 | #include <linux/slab.h> |
| 17 | #include <linux/version.h> | ||
| 18 | #include <linux/vfs.h> | 17 | #include <linux/vfs.h> |
| 19 | #include <linux/nls.h> | 18 | #include <linux/nls.h> |
| 20 | 19 | ||