From: Andrew Morton <akpm@linux-foundation.org>

Cc: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/ata/libata-acpi.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/ata/libata-acpi.c~libata-acpi-add-infrastructure-for-drivers-to-use-fix drivers/ata/libata-acpi.c
--- a/drivers/ata/libata-acpi.c~libata-acpi-add-infrastructure-for-drivers-to-use-fix
+++ a/drivers/ata/libata-acpi.c
@@ -764,7 +764,7 @@ static void *ata_pata_find_handle(struct
 	acpi_handle handle;
 	acpi_integer devfn;
 
-	if (noacpi)
+	if (libata_noacpi)
 		return NULL;
 	if (pata_get_dev_handle(dev, &handle, &devfn) < 0)
 		return NULL;
_