[LV-k25-commit] kernel-2.5/fs Kconfig,1.5,1.6

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/fs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25021/fs

Modified Files:
	Kconfig 
Log Message:
Merge with 2.6.12

Index: Kconfig
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/fs/Kconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Kconfig	27 Mar 2005 23:46:48 -0000	1.5
+++ Kconfig	24 Jul 2005 21:36:48 -0000	1.6
@@ -936,6 +936,7 @@
 config HFSPLUS_FS
 	tristate "Apple Extended HFS file system support"
 	select NLS
+	select NLS_UTF8
 	help
 	  If you say Y here, you will be able to mount extended format
 	  Macintosh-formatted hard drive partitions with full read-write access.