From: Steven Whitehouse <swhiteho@redhat.com>
Date: Thu, 25 May 2006 16:40:08 +0000 (-0400)
Subject: Merge branch 'master'
X-Git-Tag: v2.6.19-rc1~32^2~186
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=c6a756795d5ba0637aae8da89dd11bb7e3a1ee74;p=linux-2.6-omap-h63xx.git

Merge branch 'master'
---

c6a756795d5ba0637aae8da89dd11bb7e3a1ee74
diff --cc fs/Makefile
index 2c22e282c77,078d3d1191a..c731d2c0f40
--- a/fs/Makefile
+++ b/fs/Makefile
@@@ -101,6 -101,4 +102,5 @@@ obj-$(CONFIG_BEFS_FS)		+= befs
  obj-$(CONFIG_HOSTFS)		+= hostfs/
  obj-$(CONFIG_HPPFS)		+= hppfs/
  obj-$(CONFIG_DEBUG_FS)		+= debugfs/
- obj-$(CONFIG_CONFIGFS_FS)	+= configfs/
  obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
 +obj-$(CONFIG_GFS2_FS)           += gfs2/