Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6] / drivers / acpi / dock.c

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 1e872e79db33bdeaf35cdf4fd049afc0e31acd14..bb7c51f712bd6cde630e4e8e5a771ca9d9e5fc55 100644 (file)
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -917,9 +917,6 @@ static int __init dock_init(void)
 
        dock_station = NULL;
 
-       if (acpi_disabled)
-               return 0;
-
        if (acpi_disabled)
                return 0;