diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-05-06 13:55:32 -0400 |
| commit | a815752ac0ffdb910e92958d41d28f4fb28e5296 (patch) | |
| tree | a3aa16a282354da0debe8e3a3a7ed8aac6e54001 /drivers/acpi/bay.c | |
| parent | 5ade9deaaa3e1f7291467d97b238648e43eae15e (diff) | |
| parent | a15306365a16380f3bafee9e181ba01231d4acd7 (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/acpi/bay.c')
| -rw-r--r-- | drivers/acpi/bay.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index 1fa86811b8ee..d2fc94161848 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c | |||
| @@ -201,6 +201,7 @@ static int is_ejectable_bay(acpi_handle handle) | |||
| 201 | return 0; | 201 | return 0; |
| 202 | } | 202 | } |
| 203 | 203 | ||
| 204 | #if 0 | ||
| 204 | /** | 205 | /** |
| 205 | * eject_removable_drive - try to eject this drive | 206 | * eject_removable_drive - try to eject this drive |
| 206 | * @dev : the device structure of the drive | 207 | * @dev : the device structure of the drive |
| @@ -225,6 +226,7 @@ int eject_removable_drive(struct device *dev) | |||
| 225 | return 0; | 226 | return 0; |
| 226 | } | 227 | } |
| 227 | EXPORT_SYMBOL_GPL(eject_removable_drive); | 228 | EXPORT_SYMBOL_GPL(eject_removable_drive); |
| 229 | #endif /* 0 */ | ||
| 228 | 230 | ||
| 229 | static int acpi_bay_add_fs(struct bay *bay) | 231 | static int acpi_bay_add_fs(struct bay *bay) |
| 230 | { | 232 | { |