From: Andrew Morton drivers/ata/pata_acpi.c: In function 'pacpi_pre_reset': drivers/ata/pata_acpi.c:55: error: too many arguments to function 'ata_std_prereset' drivers/ata/pata_acpi.c: In function 'pacpi_error_handler': drivers/ata/pata_acpi.c:86: warning: passing argument 2 of 'ata_bmdma_drive_eh' from incompatible pointer type Cc: Alan Cox Signed-off-by: Andrew Morton --- drivers/ata/pata_acpi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -puN drivers/ata/Kconfig~pata_acpi-restore-driver-fix drivers/ata/Kconfig diff -puN drivers/ata/Makefile~pata_acpi-restore-driver-fix drivers/ata/Makefile diff -puN drivers/ata/pata_acpi.c~pata_acpi-restore-driver-fix drivers/ata/pata_acpi.c --- a/drivers/ata/pata_acpi.c~pata_acpi-restore-driver-fix +++ a/drivers/ata/pata_acpi.c @@ -45,14 +45,14 @@ struct pata_acpi { * Perform the PATA port setup we need. */ -static int pacpi_pre_reset(struct ata_port *ap, unsigned long deadline) +static int pacpi_pre_reset(struct ata_port *ap) { struct pata_acpi *acpi = ap->private_data; if (acpi->handle == NULL || ata_acpi_gtm(ap, acpi->handle, &acpi->gtm) < 0) return -ENODEV; - return ata_std_prereset(ap, deadline); + return ata_std_prereset(ap); } /** _