summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-30 16:30:51 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-05-30 16:30:51 +0000
commit48983d35d70395a391026c8f8bb1f44165ce058e (patch)
tree5e3bc42552316a5cdaf8eee331305ff7b55c7bad /target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
parent1854938e6ee49ce15d9d11e555f1a12a2e46a6fd (diff)
refresh generic 2.6.25 patches to match upstream style
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11296 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
index 4d90fc0f6..271136679 100644
--- a/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/213-kobject_uevent.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.25.4/lib/kobject_uevent.c
-===================================================================
---- linux-2.6.25.4.orig/lib/kobject_uevent.c
-+++ linux-2.6.25.4/lib/kobject_uevent.c
-@@ -27,7 +27,8 @@ u64 uevent_seqnum;
+--- a/lib/kobject_uevent.c
++++ b/lib/kobject_uevent.c
+@@ -27,7 +27,8 @@
char uevent_helper[UEVENT_HELPER_PATH_LEN] = CONFIG_UEVENT_HELPER_PATH;
static DEFINE_SPINLOCK(sequence_lock);
#if defined(CONFIG_NET)
@@ -12,7 +10,7 @@ Index: linux-2.6.25.4/lib/kobject_uevent.c
#endif
/* the strings here must match the enum in include/linux/kobject.h */
-@@ -40,6 +41,18 @@ static const char *kobject_actions[] = {
+@@ -40,6 +41,18 @@
[KOBJ_OFFLINE] = "offline",
};
@@ -31,7 +29,7 @@ Index: linux-2.6.25.4/lib/kobject_uevent.c
/**
* kobject_action_type - translate action string to numeric type
*
-@@ -192,9 +205,7 @@ int kobject_uevent_env(struct kobject *k
+@@ -192,9 +205,7 @@
kobj->state_remove_uevent_sent = 1;
/* we will send an event, so request a new sequence number */