diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 | 
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-04 14:24:15 -0400 | 
| commit | 71bfe47f023c55c322607939b786ce0a44627dfc (patch) | |
| tree | f59c37feb00f1df2e0f4ec282ae9c80ad6bb0cdc /lib | |
| parent | 73c1ac1e3b6c989b9b5f7b2313ac590a1c3b6d6a (diff) | |
| parent | efe78cda3596f8a6d1c2d4a6b1a221bafa3e1a48 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kobject_uevent.c | 4 | 
1 files changed, 0 insertions, 4 deletions
| diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c index 2b1530fc573b..7f20e7b857cb 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c | |||
| @@ -50,10 +50,6 @@ static char *action_to_string(enum kobject_action action) | |||
| 50 | return "offline"; | 50 | return "offline"; | 
| 51 | case KOBJ_ONLINE: | 51 | case KOBJ_ONLINE: | 
| 52 | return "online"; | 52 | return "online"; | 
| 53 | case KOBJ_DOCK: | ||
| 54 | return "dock"; | ||
| 55 | case KOBJ_UNDOCK: | ||
| 56 | return "undock"; | ||
| 57 | default: | 53 | default: | 
| 58 | return NULL; | 54 | return NULL; | 
| 59 | } | 55 | } | 
