diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-08-27 22:59:59 -0400 |
| commit | 8ce7a9c159c8c4eb480f0a65c6af753dbf9a1a70 (patch) | |
| tree | be59573c0af3617d0cd8a7d61f0ed119e58b1156 /drivers/acpi/dock.c | |
| parent | d2afb3ae04e36dbc6e9eb2d8bd54406ff7b6b3bd (diff) | |
| parent | 01da5fd83d6b2c5e36b77539f6cbdd8f49849225 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 1c0a39d8b04e..578b99b71d9c 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -58,8 +58,8 @@ struct dock_dependent_device { | |||
| 58 | }; | 58 | }; |
| 59 | 59 | ||
| 60 | #define DOCK_DOCKING 0x00000001 | 60 | #define DOCK_DOCKING 0x00000001 |
| 61 | #define DOCK_EVENT KOBJ_DOCK | 61 | #define DOCK_EVENT 3 |
| 62 | #define UNDOCK_EVENT KOBJ_UNDOCK | 62 | #define UNDOCK_EVENT 2 |
| 63 | 63 | ||
| 64 | static struct dock_station *dock_station; | 64 | static struct dock_station *dock_station; |
| 65 | 65 | ||
| @@ -322,11 +322,10 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event) | |||
| 322 | 322 | ||
| 323 | static void dock_event(struct dock_station *ds, u32 event, int num) | 323 | static void dock_event(struct dock_station *ds, u32 event, int num) |
| 324 | { | 324 | { |
| 325 | struct acpi_device *device; | 325 | /* |
| 326 | 326 | * we don't do events until someone tells me that | |
| 327 | device = dock_create_acpi_device(ds->handle); | 327 | * they would like to have them. |
| 328 | if (device) | 328 | */ |
| 329 | kobject_uevent(&device->kobj, num); | ||
| 330 | } | 329 | } |
| 331 | 330 | ||
| 332 | /** | 331 | /** |