Merge master.kernel.org:/home/rmk/linux-2.6-arm

[~andy/linux] / lib / kobject_uevent.c

diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
index 7f20e7b857cb559b7624d89ca4c52bbf86bc1b65..2b1530fc573bfaa4af0c7288eba1fce7af51513f 100644 (file)
--- 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;
        }