Fix ACPI vs proc_create_data() mismerge

[linux-2.6-omap-h63xx.git] / drivers / acpi / bay.c

diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c
index 1fa86811b8ee6ee8e5e675666fc1092f0b4c6eb5..d2fc94161848ff91e424b08df40f5a0d9643aafe 100644 (file)
--- a/drivers/acpi/bay.c
+++ b/drivers/acpi/bay.c
@@ -201,6 +201,7 @@ static int is_ejectable_bay(acpi_handle handle)
        return 0;
 }
 
+#if 0
 /**
  * eject_removable_drive - try to eject this drive
  * @dev : the device structure of the drive
@@ -225,6 +226,7 @@ int eject_removable_drive(struct device *dev)
        return 0;
 }
 EXPORT_SYMBOL_GPL(eject_removable_drive);
+#endif  /*  0  */
 
 static int acpi_bay_add_fs(struct bay *bay)
 {