aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-2.6.38
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
commit90bd74dd8b87d84697efbd3c2624c58496783dad (patch)
treef3d7e3f4ddf9d27b5c462dfbaed9de66214ad814 /target/linux/generic/patches-2.6.38
parentf24764a37211d2068889186d7c5e08978ef13dc3 (diff)
downloadupstream-90bd74dd8b87d84697efbd3c2624c58496783dad.tar.gz
upstream-90bd74dd8b87d84697efbd3c2624c58496783dad.tar.bz2
upstream-90bd74dd8b87d84697efbd3c2624c58496783dad.zip
fixup mtd refresh and co.
SVN-Revision: 27491
Diffstat (limited to 'target/linux/generic/patches-2.6.38')
-rw-r--r--target/linux/generic/patches-2.6.38/400-rootfs_split.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
index cabaab4b2b..630cdd9a8a 100644
--- a/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.38/400-rootfs_split.patch
@@ -260,10 +260,10 @@
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
-@@ -841,6 +841,13 @@ static int mtd_ioctl(struct file *file,
- file->f_pos = 0;
+@@ -956,6 +956,13 @@ static int mtd_ioctl(struct file *file,
break;
}
+ #endif
+#ifdef CONFIG_MTD_PARTITIONS
+ case MTDREFRESH:
+ {
@@ -272,8 +272,8 @@
+ }
+#endif
- 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 {
@@ -326,7 +326,7 @@
#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', 23)
++#define MTDREFRESH _IO('M', 24)
/*
* Obsolete legacy interface. Keep it in order not to break userspace