Re: [2.6 patch] libata-acpi.c: remove unneeded #if's

[Jeff Garzik <jeff@garzik.org>]

Adrian Bunk wrote:
> These #if's are unneeded since they:
> - did anyway not handle the CONFIG_ACPI_DOCK_MODULE case correctly and
> - this is already handled in include/acpi/acpi_drivers.h and
> - it's now correctly handled in kconfig.
> 
> Signed-off-by: Adrian Bunk <bunk@kernel.org>
> Acked-by: Tejun Heo <htejun@gmail.com>
> 
> ---
> 
> This patch has been sent on:
> - 14 Apr 2008
> - 31 Mar 2008
> 
>  drivers/ata/libata-acpi.c |    4 ----
>  1 file changed, 4 deletions(-)
> 
> 2a7326b50cd80e6570803d4efb7bc15e029e61e3 diff --git a/drivers/ata/libata-acpi.c b/drivers/ata/libata-acpi.c
> index bf98a56..1db912e 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

applied