---

yaml --- r: 350976 b: refs/heads/master c: 38475b3 h: refs/heads/master v: v3
git-mirror · Feb 13, 2013 · ed865ee · ed865ee
1 parent dec9faa
commit ed865ee
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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;