diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-31 07:53:43 -0400 |
| commit | 7bee946358c3cb957d4aa648fc5ab3cad0b232d0 (patch) | |
| tree | 693061ebde2abc35ecc846e5084630d7225aaaff /drivers/acpi/dock.c | |
| parent | d820ac4c2fa881079e6b689d2098adce337558ae (diff) | |
| parent | 15f7176eb1cccec0a332541285ee752b935c1c85 (diff) | |
Merge branch 'linus' into locking-for-linus
Conflicts:
lib/Kconfig.debug
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; |