diff options
| author | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-26 17:28:11 -0400 |
| commit | 1987f17d2266e882862528841429b5bf67bc8fe5 (patch) | |
| tree | 5c3fbee88018ab7259a18c10e6320e575d0ed679 /drivers/acpi/dock.c | |
| parent | 7198e2eeb44b3fe7cc97f997824002da47a9c644 (diff) | |
| parent | 0384e2959127a56d0640505d004d8dd92f9c29f5 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/acpi/dock.c')
| -rw-r--r-- | drivers/acpi/dock.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 35094f230b1e..7af7db1ba8c4 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -977,7 +977,7 @@ static int dock_add(acpi_handle handle) | |||
| 977 | sizeof(struct dock_station *)); | 977 | sizeof(struct dock_station *)); |
| 978 | 978 | ||
| 979 | /* we want the dock device to send uevents */ | 979 | /* we want the dock device to send uevents */ |
| 980 | dock_device->dev.uevent_suppress = 0; | 980 | dev_set_uevent_suppress(&dock_device->dev, 0); |
| 981 | 981 | ||
| 982 | if (is_dock(handle)) | 982 | if (is_dock(handle)) |
| 983 | dock_station->flags |= DOCK_IS_DOCK; | 983 | dock_station->flags |= DOCK_IS_DOCK; |