aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-11-09 21:16:36 +0000
committerJonas Gorski <jogo@openwrt.org>2011-11-09 21:16:36 +0000
commitfba8b20978ce411dead0de32f127cd0a03cc96e7 (patch)
treef5270a9e306935f791ec62a28734a5f6a53e928a /target/linux/generic
parentd405d062dc75a88535e901e255e38c8e730c8305 (diff)
downloadupstream-fba8b20978ce411dead0de32f127cd0a03cc96e7.tar.gz
upstream-fba8b20978ce411dead0de32f127cd0a03cc96e7.tar.bz2
upstream-fba8b20978ce411dead0de32f127cd0a03cc96e7.zip
target: linux: mtd: fix MTDREFRESH to an arbitrary high number
To make the ioctl number "stable", use an arbitrary high number to prevent conflicts with new mtd ioctls that would push MTDREFRESH's number. Also make mtd use the in-kernel mtd headers. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28893 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-2.6.30/065-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.31/065-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.32/065-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.36/065-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.37/400-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.38/400-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-2.6.39/400-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-3.0/400-rootfs_split.patch2
-rw-r--r--target/linux/generic/patches-3.1/400-rootfs_split.patch2
9 files changed, 9 insertions, 9 deletions
diff --git a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
index 5caf0aaff76..24aad52ef80 100644
--- a/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.30/065-rootfs_split.patch
@@ -629,7 +629,7 @@
#define ECCGETLAYOUT _IOR('M', 17, struct nand_ecclayout)
#define ECCGETSTATS _IOR('M', 18, struct mtd_ecc_stats)
#define MTDFILEMODE _IO('M', 19)
-+#define MTDREFRESH _IO('M', 23)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.31/065-rootfs_split.patch b/target/linux/generic/patches-2.6.31/065-rootfs_split.patch
index fd69e3ffafc..c585775332f 100644
--- a/target/linux/generic/patches-2.6.31/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.31/065-rootfs_split.patch
@@ -621,7 +621,7 @@
#define MEMERASE64 _IOW('M', 20, struct erase_info_user64)
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH _IO('M', 23)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.32/065-rootfs_split.patch b/target/linux/generic/patches-2.6.32/065-rootfs_split.patch
index 1d92ebeae85..288336dd45a 100644
--- a/target/linux/generic/patches-2.6.32/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.32/065-rootfs_split.patch
@@ -621,7 +621,7 @@
#define MEMERASE64 _IOW('M', 20, struct erase_info_user64)
#define MEMWRITEOOB64 _IOWR('M', 21, struct mtd_oob_buf64)
#define MEMREADOOB64 _IOWR('M', 22, struct mtd_oob_buf64)
-+#define MTDREFRESH _IO('M', 23)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
index 31eb71617bf..7e1fab106d7 100644
--- a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
@@ -621,7 +621,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', 24)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
index 788e1f35940..0eeef62deae 100644
--- a/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.37/400-rootfs_split.patch
@@ -325,7 +325,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', 24)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
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 630cdd9a8ac..9b7c2dc0b75 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
@@ -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', 24)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
index 545081403dc..226118986f8 100644
--- a/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.39/400-rootfs_split.patch
@@ -325,7 +325,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', 24)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
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 db736c3bc55..ccbe83ea3c6 100644
--- a/target/linux/generic/patches-3.0/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.0/400-rootfs_split.patch
@@ -321,7 +321,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', 24)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace
diff --git a/target/linux/generic/patches-3.1/400-rootfs_split.patch b/target/linux/generic/patches-3.1/400-rootfs_split.patch
index db736c3bc55..ccbe83ea3c6 100644
--- a/target/linux/generic/patches-3.1/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.1/400-rootfs_split.patch
@@ -321,7 +321,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', 24)
++#define MTDREFRESH _IO('M', 50)
/*
* Obsolete legacy interface. Keep it in order not to break userspace