Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 0 insertions, 4 deletions

diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
index 8c1cfc645c85..70b77e0899a8 100644
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
@@ -227,11 +227,9 @@ void ata_acpi_associate(struct ata_host *host)
                         acpi_install_notify_handler(ap->acpi_handle,
                                                     ACPI_SYSTEM_NOTIFY,
                                                     ata_acpi_ap_notify, ap);
-#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
                         /* we might be on a docking station */
                         register_hotplug_dock_device(ap->acpi_handle,
                                                      ata_acpi_ap_notify, ap);
-#endif
                 }
 
                 for (j = 0; j < ata_link_max_devices(&ap->link); j++) {
@@ -241,11 +239,9 @@ void ata_acpi_associate(struct ata_host *host)
                                 acpi_install_notify_handler(dev->acpi_handle,
                                                 ACPI_SYSTEM_NOTIFY,
                                                 ata_acpi_dev_notify, dev);
-#if defined(CONFIG_ACPI_DOCK) || defined(CONFIG_ACPI_DOCK_MODULE)
                                 /* we might be on a docking station */
                                 register_hotplug_dock_device(dev->acpi_handle,
                                                 ata_acpi_dev_notify, dev);
-#endif
                         }
                 }
         }