[Gc-linux-cvs] linux/fs Kconfig,1.17,1.18

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/fs
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/fs

Modified Files:
	Kconfig 
Log Message:
Forward to v2.6.32.


Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Kconfig	25 Oct 2009 18:56:56 -0000	1.17
--- Kconfig	9 Dec 2009 18:40:10 -0000	1.18
***************
*** 44,47 ****
--- 44,48 ----
  source "fs/ocfs2/Kconfig"
  source "fs/btrfs/Kconfig"
+ source "fs/nilfs2/Kconfig"
  
  endif # BLOCK
***************
*** 109,112 ****
--- 110,114 ----
  config TMPFS
  	bool "Virtual memory file system support (former shm fs)"
+ 	depends on SHMEM
  	help
  	  Tmpfs is a file system which keeps all files in virtual memory.
***************
*** 134,139 ****
  config HUGETLBFS
  	bool "HugeTLB file system support"
! 	depends on X86 || IA64 || PPC64 || SPARC64 || (SUPERH && MMU) || \
! 		   (S390 && 64BIT) || SYS_SUPPORTS_HUGETLBFS || BROKEN
  	help
  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
--- 136,141 ----
  config HUGETLBFS
  	bool "HugeTLB file system support"
! 	depends on X86 || IA64 || SPARC64 || (S390 && 64BIT) || \
! 		   SYS_SUPPORTS_HUGETLBFS || BROKEN
  	help
  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
***************
*** 187,191 ****
  source "fs/ufs/Kconfig"
  source "fs/exofs/Kconfig"
- source "fs/nilfs2/Kconfig"
  
  endif # MISC_FILESYSTEMS
--- 189,192 ----