aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.0
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2011-07-06 12:55:21 +0000
committerImre Kaloz <kaloz@openwrt.org>2011-07-06 12:55:21 +0000
commitce9bbbd6ec698bddf8aaf0c6d3d1ec9a37acb105 (patch)
tree777fdfa3804632b0946597d7e18a66265648a6b2 /target/linux/generic/patches-3.0
parentef94469a6f09c77808816120d240f7e58c302829 (diff)
downloadupstream-ce9bbbd6ec698bddf8aaf0c6d3d1ec9a37acb105.tar.gz
upstream-ce9bbbd6ec698bddf8aaf0c6d3d1ec9a37acb105.tar.bz2
upstream-ce9bbbd6ec698bddf8aaf0c6d3d1ec9a37acb105.zip
[generic]: fixup mtd refresh and co.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27491 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.0')
-rw-r--r--target/linux/generic/patches-3.0/400-rootfs_split.patch21
1 files changed, 16 insertions, 5 deletions
diff --git a/target/linux/generic/patches-3.0/400-rootfs_split.patch b/target/linux/generic/patches-3.0/400-rootfs_split.patch
index d623bfd88a..db736c3bc5 100644
--- a/target/linux/generic/patches-3.0/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.0/400-rootfs_split.patch
@@ -257,18 +257,19 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -834,6 +834,11 @@ static int mtd_ioctl(struct file *file,
- file->f_pos = 0;
+@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
break;
}
+
+ case MTDREFRESH:
+ {
+ ret = mtd_device_refresh(mtd);
+ break;
+ }
-
- case OTPGETREGIONCOUNT:
- case OTPGETREGIONINFO:
++
+ default:
+ ret = -ENOTTY;
+ }
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -125,6 +125,7 @@ struct nand_ecclayout {
@@ -314,3 +315,13 @@
};
#define MTDPART_OFS_NXTBLK (-2)
+--- a/include/mtd/mtd-abi.h
++++ b/include/mtd/mtd-abi.h
+@@ -127,6 +127,7 @@ struct otp_info {
+ #define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
+ #define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
+ #define MEMISLOCKED _IOR('M', 23, struct erase_info_user)
++#define MTDREFRESH _IO('M', 24)
+
+ /*
+ * Obsolete legacy interface. Keep it in order not to break userspace