linux: update 3.1 to 3.1.1

[openwrt.git] / target / linux / generic / patches-3.1 / 400-rootfs_split.patch

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 db736c3..9eb05c4 100644 (file)
--- a/target/linux/generic/patches-3.1/400-rootfs_split.patch
+++ b/target/linux/generic/patches-3.1/400-rootfs_split.patch
@@ -257,7 +257,7 @@
  
 --- a/drivers/mtd/mtdchar.c
 +++ b/drivers/mtd/mtdchar.c
-@@ -948,6 +948,12 @@ static int mtd_ioctl(struct file *file,
+@@ -949,6 +949,12 @@ static int mtd_ioctl(struct file *file,
                break;
        }
  
@@ -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