diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2015-12-15 11:20:38 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2015-12-15 11:20:38 +0000 |
| commit | 60312cff17f66cb5080ed3e3944e8afb041cb1d9 (patch) | |
| tree | 30cc8131a0e993f690e5d6a3a43bd06beac54eee /target/linux/mvebu | |
| parent | 067a43e0fb305945127fb0239cb4e1e540cd16b3 (diff) | |
| download | master-187ad058-60312cff17f66cb5080ed3e3944e8afb041cb1d9.tar.gz master-187ad058-60312cff17f66cb5080ed3e3944e8afb041cb1d9.tar.bz2 master-187ad058-60312cff17f66cb5080ed3e3944e8afb041cb1d9.zip | |
generic/4.4: bump to -rc5
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47894 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/mvebu')
| -rw-r--r-- | target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch | 34 |
1 files changed, 0 insertions, 34 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 deleted file mode 100644 index ba0bd96db4..0000000000 --- a/target/linux/mvebu/patches-4.4/000-sata_use_ifdef_around_suspend_resume.patch +++ /dev/null @@ -1,34 +0,0 @@ -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, |