summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
committerFlorian Fainelli <florian@openwrt.org>2012-10-24 13:05:22 +0000
commit7e856e5a97966fe89f6336783c0c676eb999e7cf (patch)
treeb5ea6efbf3f80d929729070d75c06b9a4cfe9eea /target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch
parent4eda974038a1d09f9a73973566f72ebfd4ce556a (diff)
downloadmtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.zip
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.gz
mtk-20170518-7e856e5a97966fe89f6336783c0c676eb999e7cf.tar.bz2
make all 3.6 patches apply and build
SVN-Revision: 33911
Diffstat (limited to 'target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch')
-rw-r--r--target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch b/target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch
index f4535a6..3d70505 100644
--- a/target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch
+++ b/target/linux/generic/patches-3.6/502-yaffs_git_2010_10_20.patch
@@ -1,6 +1,6 @@
--- a/fs/Kconfig
+++ b/fs/Kconfig
-@@ -35,7 +35,6 @@ source "fs/gfs2/Kconfig"
+@@ -39,7 +39,6 @@ source "fs/gfs2/Kconfig"
source "fs/ocfs2/Kconfig"
source "fs/btrfs/Kconfig"
source "fs/nilfs2/Kconfig"
@@ -8,7 +8,7 @@
endif # BLOCK
-@@ -201,6 +200,10 @@ source "fs/hfsplus/Kconfig"
+@@ -205,6 +204,10 @@ source "fs/hfsplus/Kconfig"
source "fs/befs/Kconfig"
source "fs/bfs/Kconfig"
source "fs/efs/Kconfig"
@@ -21,7 +21,7 @@
source "fs/ubifs/Kconfig"
--- a/fs/Makefile
+++ b/fs/Makefile
-@@ -125,5 +125,6 @@ obj-$(CONFIG_GFS2_FS) += gfs2/
+@@ -126,5 +126,6 @@ obj-$(CONFIG_GFS2_FS) += gfs2/
obj-y += exofs/ # Multiple modules
obj-$(CONFIG_CEPH_FS) += ceph/
obj-$(CONFIG_PSTORE) += pstore/