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

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index fa44fb96fc..bb7c51f712 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -834,7 +834,7 @@ static int dock_add(acpi_handle handle)
 		goto dock_add_err;
 	}
 
-	printk(KERN_INFO PREFIX "%s \n", ACPI_DOCK_DRIVER_DESCRIPTION);
+	printk(KERN_INFO PREFIX "%s\n", ACPI_DOCK_DRIVER_DESCRIPTION);
 
 	return 0;
 
@@ -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);