diff --git a/[refs] b/[refs] index 581980712b8d..ed8520b57a57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4e4f64da58bc71a139722bb5013adda0f7ca4e78 +refs/heads/master: 392798a17b6afba5928bc577aeb7bc83a1585534 diff --git a/trunk/drivers/acpi/bay.c b/trunk/drivers/acpi/bay.c index e6caf5d42e0e..61b6c5beb2d3 100644 --- a/trunk/drivers/acpi/bay.c +++ b/trunk/drivers/acpi/bay.c @@ -377,9 +377,6 @@ static int __init bay_init(void) INIT_LIST_HEAD(&drive_bays); - if (acpi_disabled) - return -ENODEV; - if (acpi_disabled) return -ENODEV; diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index 1e872e79db33..bb7c51f712bd 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/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;