X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2Fdock.c;h=bb7c51f712bd6cde630e4e8e5a771ca9d9e5fc55;hb=6236af82d8a989e150a02800c210eb61cb1e17be;hp=96c542f7fded0c3abe8bfb3e07eec1a15a52ae41;hpb=da50ccc6a0f32ad29c1168837330a78e6e2e2923;p=linux-2.6

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 96c542f7fd..bb7c51f712 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -917,6 +917,9 @@ static int __init dock_init(void)
 
 	dock_station = NULL;
 
+	if (acpi_disabled)
+		return 0;
+
 	/* look for a dock station */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,
 			    ACPI_UINT32_MAX, find_dock, &num, NULL);