Merge branch 'master' of /home/trondmy/kernel/linux-2.6/

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 7f20e7b857cb..2b1530fc573b 100644
--- a/lib/kobject_uevent.c
+++ b/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;
         }