diff --git a/[refs] b/[refs] index 08e3426a6e1d..53357fc5ba7e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5f27ee8e1261e47ec2e9dbebf17e87e55f568d75 +refs/heads/master: 38475b3be1517a16d263b0b04dae862bf7027d48 diff --git a/trunk/drivers/acpi/scan.c b/trunk/drivers/acpi/scan.c index bf6e2c26f52d..5bc2641fba8a 100644 --- a/trunk/drivers/acpi/scan.c +++ b/trunk/drivers/acpi/scan.c @@ -202,12 +202,10 @@ acpi_eject_store(struct device *d, struct device_attribute *attr, if ((!count) || (buf[0] != '1')) { return -EINVAL; } -#ifndef FORCE_EJECT if (!acpi_device->driver && !acpi_device->handler) { ret = -ENODEV; goto err; } -#endif status = acpi_get_type(acpi_device->handle, &type); if (ACPI_FAILURE(status) || (!acpi_device->flags.ejectable)) { ret = -ENODEV;