From ae7de97037b98053adbd7cfbcb440895f9608ef6 Mon Sep 17 00:00:00 2001
From: Kristen Accardi <kristen.c.accardi@intel.com>
Date: Sat, 24 Jun 2006 19:36:00 -0400
Subject: [PATCH] --- yaml --- r: 31439 b: refs/heads/master c:
 a6a888b3c20cf559c8a2e6e4d86c570dda2ef0f5 h: refs/heads/master i:   31437:
 80f1819d6eb2d97075eb9a7da567de20f0b01fa8   31435:
 562b9b3d4de2062194d59fe9976906f05a1ac7ca   31431:
 efac34acaba81960a884a5b6c41fd133395801b3   31423:
 f55bb6d3426d1cc54bd06c4f25e4fc881e7d3472 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/kobject.h | 2 ++
 trunk/lib/kobject_uevent.c    | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cbdc9f9fdfd6..f881738f2506 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e7d8818114f08ad9078d2c1a8a88d78d49de8dc
+refs/heads/master: a6a888b3c20cf559c8a2e6e4d86c570dda2ef0f5
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 2d229327959e..0503b2ed8bae 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -46,6 +46,8 @@ enum kobject_action {
 	KOBJ_UMOUNT	= (__force kobject_action_t) 0x05,	/* umount event for block devices (broken) */
 	KOBJ_OFFLINE	= (__force kobject_action_t) 0x06,	/* device offline */
 	KOBJ_ONLINE	= (__force kobject_action_t) 0x07,	/* device online */
+	KOBJ_UNDOCK	= (__force kobject_action_t) 0x08, 	/* undocking */
+	KOBJ_DOCK	= (__force kobject_action_t) 0x09,	/* dock */
 };
 
 struct kobject {
diff --git a/trunk/lib/kobject_uevent.c b/trunk/lib/kobject_uevent.c
index 7f20e7b857cb..2b1530fc573b 100644
--- a/trunk/lib/kobject_uevent.c
+++ b/trunk/lib/kobject_uevent.c
@@ -50,6 +50,10 @@ static char *action_to_string(enum kobject_action action)
 		return "offline";
 	case KOBJ_ONLINE:
 		return "online";
+	case KOBJ_DOCK:
+		return "dock";
+	case KOBJ_UNDOCK:
+		return "undock";
 	default:
 		return NULL;
 	}