On a Powerpc box latest git (2.6.32-rc3-git2: 36a07902...) failed to build with following error : drivers/ata/ahci.c: In function 'ahci_gtf_filter_workaround': drivers/ata/ahci.c:2927: error: 'struct ata_device' has no member named 'gtf_filter' make[2]: *** [drivers/ata/ahci.o] Error 1 The code was introduced by f80ae7e45a0e03da188494c6e947a5c8b0cdfb4a. CONFIG_ATA_ACPI is not set in this case. The following patch fixes the build break for me. Signed-off-by : Sachin Sant <sachinp@xxxxxxxxxx> ---
With !CONFIG_ATA_ACPI drivers/ata build breaks with following error drivers/ata/ahci.c: In function 'ahci_gtf_filter_workaround': drivers/ata/ahci.c:2927: error: 'struct ata_device' has no member named 'gtf_filter' make[2]: *** [drivers/ata/ahci.o] Error 1 Box the function within CONFIG_ATA_ACPI. Signed-off-by : Sachin Sant <sachinp@xxxxxxxxxx> --- diff -Naurp old/drivers/ata/ahci.c new/drivers/ata/ahci.c --- old/drivers/ata/ahci.c 2009-10-09 11:34:28.000000000 +0530 +++ new/drivers/ata/ahci.c 2009-10-09 11:36:39.000000000 +0530 @@ -2884,6 +2884,7 @@ static bool ahci_broken_online(struct pc return pdev->bus->number == (val >> 8) && pdev->devfn == (val & 0xff); } +#ifdef CONFIG_ATA_ACPI static void ahci_gtf_filter_workaround(struct ata_host *host) { static const struct dmi_system_id sysids[] = { @@ -2927,6 +2928,7 @@ static void ahci_gtf_filter_workaround(s dev->gtf_filter |= filter; } } +#endif static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) { @@ -3093,8 +3095,10 @@ static int ahci_init_one(struct pci_dev /* apply workaround for ASUS P5W DH Deluxe mainboard */ ahci_p5wdh_workaround(host); +#ifdef CONFIG_ATA_ACPI /* apply gtf filter quirk */ ahci_gtf_filter_workaround(host); +#endif /* initialize adapter */ rc = ahci_configure_dma_masks(pdev, hpriv->cap & HOST_CAP_64);