ppp: fix fallout from the size reduction patch (thx, frogonwheels)

[openwrt.git] / target / linux / generic / patches-2.6.36 / 065-rootfs_split.patch

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 43292bf..74471f1 100644 (file)
--- a/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
+++ b/target/linux/generic/patches-2.6.36/065-rootfs_split.patch
@@ -554,7 +554,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/map.h>

-@@ -854,6 +855,13 @@ static int mtd_ioctl(struct file *file,
+@@ -854,6 +855,13 @@ static int mtd_ioctl(struct file *file, 

                file->f_pos = 0;
                break;
        }
                file->f_pos = 0;
                break;
        }


@@ -570,7 +570,7 @@
                ret = -ENOTTY;
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h
                ret = -ENOTTY;
 --- a/include/linux/mtd/mtd.h
 +++ b/include/linux/mtd/mtd.h

-@@ -98,6 +98,7 @@ struct mtd_oob_ops {
+@@ -110,6 +110,7 @@ struct mtd_oob_ops {

        uint8_t         *oobbuf;
  };
  
        uint8_t         *oobbuf;
  };
  


@@ -578,7 +578,7 @@
  struct mtd_info {
        u_char type;
        uint32_t flags;
  struct mtd_info {
        u_char type;
        uint32_t flags;

-@@ -238,6 +239,9 @@ struct mtd_info {
+@@ -251,6 +252,9 @@ struct mtd_info {

        struct device dev;
        int usecount;
  
        struct device dev;
        int usecount;