summaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-05-30 17:19:24 +0000
commit74215746b332d79139e92650a4240c97e3a88845 (patch)
treec4c9b4bf8791e93a1d21aad5b904bb17a814c726 /target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
parent2259476f060ea4b9ca9cffa82ad052a690606fab (diff)
downloadmaster-31e0f0ae-74215746b332d79139e92650a4240c97e3a88845.tar.gz
master-31e0f0ae-74215746b332d79139e92650a4240c97e3a88845.tar.bz2
master-31e0f0ae-74215746b332d79139e92650a4240c97e3a88845.zip
refresh generic 2.6.24 patches to match upstream style
SVN-Revision: 11302
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch')
-rw-r--r--target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch b/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
index 17337276a7..6f9bbeb228 100644
--- a/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
+++ b/target/linux/generic-2.6/patches-2.6.24/213-kobject_uevent.patch
@@ -1,8 +1,6 @@
-Index: linux-2.6.24.7/lib/kobject_uevent.c
-===================================================================
---- linux-2.6.24.7.orig/lib/kobject_uevent.c
-+++ linux-2.6.24.7/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.24.7/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.24.7/lib/kobject_uevent.c
/**
* kobject_action_type - translate action string to numeric type
*
-@@ -173,9 +186,7 @@ int kobject_uevent_env(struct kobject *k
+@@ -173,9 +186,7 @@
}
/* we will send an event, so request a new sequence number */