diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 13:54:08 +0200 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-07-27 13:54:08 +0200 |
| commit | eda3d8f5604860aae1bb9996bb5efc4213778369 (patch) | |
| tree | 9d3887d2665bcc5f5abf200758794545c7b2c69b /drivers/acpi/bay.c | |
| parent | 87a9f704658a40940e740b1d73d861667e9164d3 (diff) | |
| parent | 8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff) | |
Merge commit 'upstream/master'
Diffstat (limited to 'drivers/acpi/bay.c')
| -rw-r--r-- | drivers/acpi/bay.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/bay.c b/drivers/acpi/bay.c index e6caf5d42e0..61b6c5beb2d 100644 --- a/drivers/acpi/bay.c +++ b/drivers/acpi/bay.c @@ -380,9 +380,6 @@ static int __init bay_init(void) if (acpi_disabled) return -ENODEV; - if (acpi_disabled) - return -ENODEV; - /* look for dockable drive bays */ acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, ACPI_UINT32_MAX, find_bay, &bays, NULL); |