From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeff Garzik Subject: Re: [2.6 patch] libata-acpi.c: remove unneeded #if's Date: Fri, 25 Apr 2008 00:48:20 -0400 Message-ID: <48116294.80106@garzik.org> References: <20080421225035.GK2633@cs181133002.pp.htv.fi> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from srv5.dvmed.net ([207.36.208.214]:46572 "EHLO mail.dvmed.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbYDYEsW (ORCPT ); Fri, 25 Apr 2008 00:48:22 -0400 In-Reply-To: <20080421225035.GK2633@cs181133002.pp.htv.fi> Sender: linux-ide-owner@vger.kernel.org List-Id: linux-ide@vger.kernel.org To: Adrian Bunk Cc: Tejun Heo , linux-ide@vger.kernel.org, linux-kernel@vger.kernel.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 > Acked-by: Tejun Heo > > --- > > 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