diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /fs/isofs/joliet.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'fs/isofs/joliet.c')
| -rw-r--r-- | fs/isofs/joliet.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/isofs/joliet.c b/fs/isofs/joliet.c index 86c50e22fc87..2931de7f1a6a 100644 --- a/fs/isofs/joliet.c +++ b/fs/isofs/joliet.c | |||
| @@ -6,11 +6,9 @@ | |||
| 6 | * Joliet: Microsoft's Unicode extensions to iso9660 | 6 | * Joliet: Microsoft's Unicode extensions to iso9660 |
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #include <linux/string.h> | 9 | #include <linux/types.h> |
| 10 | #include <linux/nls.h> | 10 | #include <linux/nls.h> |
| 11 | #include <linux/mm.h> | 11 | #include "isofs.h" |
| 12 | #include <linux/iso_fs.h> | ||
| 13 | #include <asm/unaligned.h> | ||
| 14 | 12 | ||
| 15 | /* | 13 | /* |
| 16 | * Convert Unicode 16 to UTF8 or ASCII. | 14 | * Convert Unicode 16 to UTF8 or ASCII. |