generic/4.4: bump to -rc5

[openwrt/svn-archive/archive.git] / target / linux / mvebu / patches-4.4 / 000-sata_use_ifdef_around_suspend_resume.patch

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 (file)
index ba0bd96..0000000
--- 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,