From 71872835da5a3025fed65eebec4d5f83b4dbb9d6 Mon Sep 17 00:00:00 2001
From: Kristen Carlson Accardi <kristen.c.accardi@intel.com>
Date: Tue, 1 Aug 2006 14:59:19 -0700
Subject: [PATCH] --- yaml --- r: 33135 b: refs/heads/master c:
 5669021e40964303994a20633548732c6bb26636 h: refs/heads/master i:   33133:
 04092489e97c4004b432df7a70e8b96f8279904c   33131:
 107868184585e7d6811a7aec84bf6038e12aebfb   33127:
 e9382cf26eeead52e7ab3622307ea96600a8a8ea   33119:
 009a80c32eeda29703dbb516a0b94014ff652ff9 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/acpi/dock.c     | 13 ++++++-------
 trunk/include/linux/kobject.h |  2 --
 trunk/lib/kobject_uevent.c    |  4 ----
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index adda601b18a0..009b90c3b613 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 321311af25cbb65d3cc177e3777fedd526814ecc
+refs/heads/master: 5669021e40964303994a20633548732c6bb26636
diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c
index 1c0a39d8b04e..578b99b71d9c 100644
--- a/trunk/drivers/acpi/dock.c
+++ b/trunk/drivers/acpi/dock.c
@@ -58,8 +58,8 @@ struct dock_dependent_device {
 };
 
 #define DOCK_DOCKING	0x00000001
-#define DOCK_EVENT	KOBJ_DOCK
-#define UNDOCK_EVENT	KOBJ_UNDOCK
+#define DOCK_EVENT	3
+#define UNDOCK_EVENT	2
 
 static struct dock_station *dock_station;
 
@@ -322,11 +322,10 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
 
 static void dock_event(struct dock_station *ds, u32 event, int num)
 {
-	struct acpi_device *device;
-
-	device = dock_create_acpi_device(ds->handle);
-	if (device)
-		kobject_uevent(&device->kobj, num);
+	/*
+	 * we don't do events until someone tells me that
+	 * they would like to have them.
+	 */
 }
 
 /**
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 0503b2ed8bae..2d229327959e 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -46,8 +46,6 @@ 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 2b1530fc573b..7f20e7b857cb 100644
--- a/trunk/lib/kobject_uevent.c
+++ b/trunk/lib/kobject_uevent.c
@@ -50,10 +50,6 @@ 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;
 	}