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

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

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

Modified Files:
	Makefile 
Log Message:
Merge 2.6.29-rc7.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/fs/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	2 Mar 2009 19:26:37 -0000	1.13
--- Makefile	5 Mar 2009 19:58:47 -0000	1.14
***************
*** 70,77 ****
  obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
  obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3
! obj-$(CONFIG_EXT4_FS)		+= ext4/ # Before ext2 so root fs can be ext4
  obj-$(CONFIG_JBD)		+= jbd/
  obj-$(CONFIG_JBD2)		+= jbd2/
- obj-$(CONFIG_EXT2_FS)		+= ext2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
  obj-$(CONFIG_SQUASHFS)		+= squashfs/
--- 70,79 ----
  obj-$(CONFIG_REISERFS_FS)	+= reiserfs/
  obj-$(CONFIG_EXT3_FS)		+= ext3/ # Before ext2 so root fs can be ext3
! obj-$(CONFIG_EXT2_FS)		+= ext2/
! # We place ext4 after ext2 so plain ext2 root fs's are mounted using ext2
! # unless explicitly requested by rootfstype
! obj-$(CONFIG_EXT4_FS)		+= ext4/
  obj-$(CONFIG_JBD)		+= jbd/
  obj-$(CONFIG_JBD2)		+= jbd2/
  obj-$(CONFIG_CRAMFS)		+= cramfs/
  obj-$(CONFIG_SQUASHFS)		+= squashfs/