diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-12-10 12:11:39 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-12-10 12:11:39 +0000 |
| commit | 5ebd542e37333a71ef23f61f86f97c7b3905c819 (patch) | |
| tree | 586bbb68a965ff81d5d2012dde6ae46a36e4319b /target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch | |
| parent | b17844d21af30b467e108c765c7010eba2b2b28e (diff) | |
| download | upstream-5ebd542e37333a71ef23f61f86f97c7b3905c819.tar.gz upstream-5ebd542e37333a71ef23f61f86f97c7b3905c819.tar.bz2 upstream-5ebd542e37333a71ef23f61f86f97c7b3905c819.zip | |
mvebu: add support for 4.4-rc
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 47819
Diffstat (limited to 'target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch b/target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch new file mode 100644 index 0000000000..ba0bd96db4 --- /dev/null +++ b/target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch @@ -0,0 +1,34 @@ +The newly added suspend/resume implementation for ahci_mvebu causes +a link error when CONFIG_PM_SUSPEND is disabled: + +ERROR: "ahci_platform_suspend_host" [drivers/ata/ahci_mvebu.ko] undefined! +ERROR: "ahci_platform_resume_host" [drivers/ata/ahci_mvebu.ko] undefined! + +This adds the same #ifdef here that exists in the ahci_platform driver +which defines the above functions. + +Signed-off-by: Arnd Bergmann <arnd@arndb.de> +Fixes: d6ecf1581488 ("ata: ahci_mvebu: add suspend/resume support") +Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +--- a/drivers/ata/ahci_mvebu.c ++++ b/drivers/ata/ahci_mvebu.c +@@ -62,6 +62,7 @@ static void ahci_mvebu_regret_option(str + writel(0x80, hpriv->mmio + AHCI_VENDOR_SPECIFIC_0_DATA); + } + ++#ifdef CONFIG_PM_SLEEP + static int ahci_mvebu_suspend(struct platform_device *pdev, pm_message_t state) + { + return ahci_platform_suspend_host(&pdev->dev); +@@ -81,6 +82,10 @@ static int ahci_mvebu_resume(struct plat + + return ahci_platform_resume_host(&pdev->dev); + } ++#else ++#define ahci_mvebu_suspend NULL ++#define ahci_mvebu_resume NULL ++#endif + + static const struct ata_port_info ahci_mvebu_port_info = { + .flags = AHCI_FLAG_COMMON, |