Merge branch 'nommu' of master.kernel.org:/home/rmk/linux-2.6-arm

[linux-2.6-omap-h63xx.git] / fs / isofs / joliet.c

diff --git a/fs/isofs/joliet.c b/fs/isofs/joliet.c
index 86c50e22fc87ec7ce934f701047709d086e5bae8..81a90e170ac36a10a8fd56e4e3d2242dfab1885d 100644 (file)
--- a/fs/isofs/joliet.c
+++ b/fs/isofs/joliet.c
@@ -6,14 +6,12 @@
  *  Joliet: Microsoft's Unicode extensions to iso9660
  */
 
-#include <linux/string.h>
+#include <linux/types.h>
 #include <linux/nls.h>
-#include <linux/mm.h>
-#include <linux/iso_fs.h>
-#include <asm/unaligned.h>
+#include "isofs.h"
 
 /*
- * Convert Unicode 16 to UTF8 or ASCII.
+ * Convert Unicode 16 to UTF-8 or ASCII.
  */
 static int
 uni16_to_x8(unsigned char *ascii, u16 *uni, int len, struct nls_table *nls)