Linus, Please apply attached patch. It puts a #ifndef;#define;#endif block around the contents of linux/include/linux to allow for multiple #includes of <linux/nls.h>. Best regards, Anton -- Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @) Linux NTFS maintainer / WWW: http://sourceforge.net/projects/linux-ntfs/ ICQ: 8561279 / WWW: http://www-stu.christs.cam.ac.uk/~aia21/
--- linux/include/linux/nls.h.old Mon May 14 15:20:16 2001 +++ linux/include/linux/nls.h Mon May 14 15:24:41 2001 @@ -1,3 +1,6 @@ +#ifndef _LINUX_NLS_H +#define _LINUX_NLS_H + #include <linux/init.h> /* unicode character */ @@ -28,3 +31,6 @@ extern int utf8_mbstowcs(wchar_t *, const __u8 *, int); extern int utf8_wctomb(__u8 *, wchar_t, int); extern int utf8_wcstombs(__u8 *, const wchar_t *, int); + +#endif /* _LINUX_NLS_H */ +