From cd6d4d4ac274bde69dabb6ffd96415dd06235ce9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= Date: Tue, 19 Oct 2010 09:13:39 +0200 Subject: [PATCH] --- yaml --- r: 217696 b: refs/heads/master c: d38a5edf812c2f715242aa20b6beb785939a0096 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/dock.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5d76f31e581c..77eb9caee60a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab7c13c4a5a22335b0cfc6f364ee77abed66503c +refs/heads/master: d38a5edf812c2f715242aa20b6beb785939a0096 diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index 3fe29e992be8..2b1656322ee2 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/drivers/acpi/dock.c @@ -929,7 +929,7 @@ static struct attribute_group dock_attribute_group = { * allocated and initialize a new dock station device. Find all devices * that are on the dock station, and register for dock event notifications. */ -static int dock_add(acpi_handle handle) +static int __init dock_add(acpi_handle handle) { int ret, id; struct dock_station ds, *dock_station; @@ -1023,7 +1023,7 @@ static int dock_remove(struct dock_station *ds) * * This is called by acpi_walk_namespace to look for dock stations. */ -static acpi_status +static __init acpi_status find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) { if (is_dock(handle)) @@ -1032,7 +1032,7 @@ find_dock(acpi_handle handle, u32 lvl, void *context, void **rv) return AE_OK; } -static acpi_status +static __init acpi_status find_bay(acpi_handle handle, u32 lvl, void *context, void **rv) { /* If bay is a dock, it's already handled */