[package] libpcap: explicitely disable libnl support to prevent different build resul...

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

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 cabaab4..9b7c2dc 100644 (file)
--- 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
  
 --- 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;
        }
                break;
        }

+ #endif

 +#ifdef CONFIG_MTD_PARTITIONS
 +      case MTDREFRESH:
 +      {
 +#ifdef CONFIG_MTD_PARTITIONS
 +      case MTDREFRESH:
 +      {


@@ -272,8 +272,8 @@
 +      }
 +#endif
  
 +      }
 +#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 {
 --- 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 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', 50)

  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace
  
  /*
   * Obsolete legacy interface. Keep it in order not to break userspace