diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-12-18 15:43:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-12-18 15:43:25 +0000 |
| commit | ca96b2113eb5d15c637bf020ee507a6faca67b0c (patch) | |
| tree | 5389659c29be42d276711c08b716caa348068730 /target/linux/generic-2.6/patches-2.6.31 | |
| parent | 7ce0bc44721708018f14fb610d83d8b154edc3bb (diff) | |
| download | upstream-ca96b2113eb5d15c637bf020ee507a6faca67b0c.tar.gz upstream-ca96b2113eb5d15c637bf020ee507a6faca67b0c.tar.bz2 upstream-ca96b2113eb5d15c637bf020ee507a6faca67b0c.zip | |
refresh 2.6.31 patches
SVN-Revision: 18823
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.31')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch | 4 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch b/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch index 287f793031..08a1efc29c 100644 --- a/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch +++ b/target/linux/generic-2.6/patches-2.6.31/510-yaffs_support.patch @@ -1,6 +1,6 @@ --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -196,6 +196,7 @@ source "fs/sysv/Kconfig" +@@ -188,6 +188,7 @@ source "fs/sysv/Kconfig" source "fs/ufs/Kconfig" source "fs/exofs/Kconfig" source "fs/nilfs2/Kconfig" @@ -10,7 +10,7 @@ --- a/fs/Makefile +++ b/fs/Makefile -@@ -126,3 +126,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/ +@@ -125,3 +125,4 @@ obj-$(CONFIG_OCFS2_FS) += ocfs2/ obj-$(CONFIG_BTRFS_FS) += btrfs/ obj-$(CONFIG_GFS2_FS) += gfs2/ obj-$(CONFIG_EXOFS_FS) += exofs/ diff --git a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch index 8ad4cb2961..1b8f3a9307 100644 --- a/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch +++ b/target/linux/generic-2.6/patches-2.6.31/980-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2769,6 +2769,16 @@ int shmem_unuse(swp_entry_t entry, struc +@@ -2602,6 +2602,16 @@ int shmem_unuse(swp_entry_t entry, struc /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc/<pid>/maps -@@ -2848,10 +2858,7 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2681,10 +2691,7 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); |