[ar71xx] WRT160NL: enable mtd parser on 2.6.30

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.27 / 219-kobject_uevent.patch

diff --git a/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch
index 93ed1d0..279665e 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/219-kobject_uevent.patch
@@ -1,6 +1,6 @@
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c
 --- a/lib/kobject_uevent.c
 +++ b/lib/kobject_uevent.c

-@@ -29,7 +29,8 @@
+@@ -29,7 +29,8 @@ u64 uevent_seqnum;

  char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
  static DEFINE_SPINLOCK(sequence_lock);
  #if defined(CONFIG_NET)
  char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
  static DEFINE_SPINLOCK(sequence_lock);
  #if defined(CONFIG_NET)


@@ -10,7 +10,7 @@
  #endif
  
  /* the strings here must match the enum in include/linux/kobject.h */
  #endif
  
  /* the strings here must match the enum in include/linux/kobject.h */

-@@ -42,6 +43,18 @@
+@@ -42,6 +43,18 @@ static const char *kobject_actions[] = {

        [KOBJ_OFFLINE] =        "offline",
  };
  
        [KOBJ_OFFLINE] =        "offline",
  };
  


@@ -29,7 +29,7 @@
  /**
   * kobject_action_type - translate action string to numeric type
   *
  /**
   * kobject_action_type - translate action string to numeric type
   *

-@@ -194,9 +207,7 @@
+@@ -194,9 +207,7 @@ int kobject_uevent_env(struct kobject *k

                kobj->state_remove_uevent_sent = 1;
  
        /* we will send an event, so request a new sequence number */
                kobj->state_remove_uevent_sent = 1;
  
        /* we will send an event, so request a new sequence number */