From: Alexandros C. Couloumbis <alex@ozo.com>
Date: Sun, 21 Mar 2010 06:53:08 +0000 (+0000)
Subject: generic-2.6: sync patches to 2.6.34-rc2
X-Git-Tag: reboot~20573
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0fa2deaa280b7c058b270ddc07db22d65c86d590;p=openwrt%2Fstaging%2Flynxis.git

generic-2.6: sync patches to 2.6.34-rc2

SVN-Revision: 20329
---

diff --git a/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
index e490452e58..b14de5940d 100644
--- a/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.34/510-yaffs_support.patch
@@ -10,8 +10,9 @@
  
 --- a/fs/Makefile
 +++ b/fs/Makefile
-@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS)		+= ocfs2/
- obj-$(CONFIG_BTRFS_FS)		+= btrfs/
+@@ -127,3 +127,5 @@
  obj-$(CONFIG_GFS2_FS)           += gfs2/
  obj-$(CONFIG_EXOFS_FS)          += exofs/
+ obj-$(CONFIG_CEPH_FS)		+= ceph/
 +obj-$(CONFIG_YAFFS_FS)		+= yaffs2/
++