[Gc-linux-cvs] linux/fs Kconfig,1.14,1.15 Makefile,1.12,1.13

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

Update of /cvsroot/gc-linux/linux/fs
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/fs

Modified Files:
	Kconfig Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	1 Feb 2009 18:29:35 -0000	1.12
--- Makefile	2 Mar 2009 19:26:37 -0000	1.13
***************
*** 21,26 ****
  
  obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
! obj-$(CONFIG_INOTIFY)		+= inotify.o
! obj-$(CONFIG_INOTIFY_USER)	+= inotify_user.o
  obj-$(CONFIG_EPOLL)		+= eventpoll.o
  obj-$(CONFIG_ANON_INODES)	+= anon_inodes.o
--- 21,25 ----
  
  obj-$(CONFIG_BLK_DEV_INTEGRITY) += bio-integrity.o
! obj-y				+= notify/
  obj-$(CONFIG_EPOLL)		+= eventpoll.o
  obj-$(CONFIG_ANON_INODES)	+= anon_inodes.o
***************
*** 56,63 ****
  obj-$(CONFIG_QFMT_V1)		+= quota_v1.o
  obj-$(CONFIG_QFMT_V2)		+= quota_v2.o
  obj-$(CONFIG_QUOTACTL)		+= quota.o
  
- obj-$(CONFIG_DNOTIFY)		+= dnotify.o
- 
  obj-$(CONFIG_PROC_FS)		+= proc/
  obj-y				+= partitions/
--- 55,61 ----
  obj-$(CONFIG_QFMT_V1)		+= quota_v1.o
  obj-$(CONFIG_QFMT_V2)		+= quota_v2.o
+ obj-$(CONFIG_QUOTA_TREE)	+= quota_tree.o
  obj-$(CONFIG_QUOTACTL)		+= quota.o
  
  obj-$(CONFIG_PROC_FS)		+= proc/
  obj-y				+= partitions/
***************
*** 77,80 ****
--- 75,79 ----
  obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
+ obj-$(CONFIG_SQUASHFS)		+= squashfs/
  obj-y				+= ramfs/
  obj-$(CONFIG_HUGETLBFS)		+= hugetlbfs/
***************
*** 84,88 ****
  obj-$(CONFIG_BFS_FS)		+= bfs/
  obj-$(CONFIG_ISO9660_FS)	+= isofs/
- obj-$(CONFIG_GCDVD_FS)		+= gcdvdfs/
  obj-$(CONFIG_HFSPLUS_FS)	+= hfsplus/ # Before hfs to find wrapped HFS+
  obj-$(CONFIG_HFS_FS)		+= hfs/
--- 83,86 ----
***************
*** 123,125 ****
--- 121,124 ----
  obj-$(CONFIG_DEBUG_FS)		+= debugfs/
  obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
+ obj-$(CONFIG_BTRFS_FS)		+= btrfs/
  obj-$(CONFIG_GFS2_FS)           += gfs2/

Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Kconfig,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Kconfig	1 Feb 2009 18:29:35 -0000	1.14
--- Kconfig	2 Mar 2009 19:26:37 -0000	1.15
***************
*** 28,166 ****
  	default m if EXT2_FS_XATTR || EXT3_FS_XATTR || EXT4_FS_XATTR
  
! config REISERFS_FS
! 	tristate "Reiserfs support"
! 	help
! 	  Stores not just filenames but the files themselves in a balanced
! 	  tree.  Uses journalling.
! 
! 	  Balanced trees are more efficient than traditional file system
! 	  architectural foundations.
[...1509 lines suppressed...]
! 	  If you say Y here, you will get experimental support for
! 	  Plan 9 resource sharing via the 9P2000 protocol.
! 
! 	  See <http://v9fs.sf.net> for more information.
! 
! 	  If unsure, say N.
  
  endif # NETWORK_FILESYSTEMS
--- 265,275 ----
  	default y
  
! source "net/sunrpc/Kconfig"
! source "fs/smbfs/Kconfig"
  source "fs/cifs/Kconfig"
  source "fs/ncpfs/Kconfig"
! source "fs/coda/Kconfig"
! source "fs/afs/Kconfig"
! source "fs/9p/Kconfig"
  
  endif # NETWORK_FILESYSTEMS