X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Facpi%2Fdock.c;h=bb7c51f712bd6cde630e4e8e5a771ca9d9e5fc55;hb=766b0925c07cd363c17ff54ebf59b6d34d8042d5;hp=96c542f7fded0c3abe8bfb3e07eec1a15a52ae41;hpb=8bbd54d69e9c66adbf544e21d8dcfb15fb9198f7;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 96c542f7fde..bb7c51f712b 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);