From: Stephen Rothwell Date: Mon, 2 Jul 2012 02:10:41 +0000 (+1000) Subject: libata-acpi: fix up for acpi_pm_device_sleep_state API X-Git-Tag: v3.6-rc1~102^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=354b2eac3848bddbcb111079138b907ccca70ae8;p=pandora-kernel.git libata-acpi: fix up for acpi_pm_device_sleep_state API After merging the libata tree, today's [2012-07-01] linux-next build (x86_64 allmodconfig) failed like this: drivers/ata/libata-acpi.c: In function 'ata_acpi_set_state': drivers/ata/libata-acpi.c:872:5: error: too few arguments to function 'acpi_pm_device_sleep_state' include/acpi/acpi_bus.h:418:5: note: declared here Caused by commit 3bd46600a7a7 ("libata-acpi: add ata port runtime D3Cold support") from the libata tree interacting with commit ee85f543710d ("ACPI/PM: specify lowest allowed state for device sleep state") from the pci tree. This patch adds ACPI_STATE_D3 as the new third parameter to acpi_pm_device_sleep_state() Signed-off-by: Stephen Rothwell Signed-off-by: Jeff Garzik --- Reading git-diff-tree failed