summaryrefslogtreecommitdiffstats
path: root/target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch')
-rw-r--r--target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch60
1 files changed, 60 insertions, 0 deletions
diff --git a/target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch b/target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch
new file mode 100644
index 000000000..68a2d982f
--- /dev/null
+++ b/target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch
@@ -0,0 +1,60 @@
+From 968c41d0c32099d78927849a71e2ef3143cc05e7 Mon Sep 17 00:00:00 2001
+From: Andrzej Zaborowski <balrog@zabor.org>
+Date: Mon, 22 Sep 2008 23:01:47 +0100
+Subject: [PATCH] fix-build-with-no-CONFIG_MMC
+
+I hit this when updating to 2.6.26. Also if CONFIG_MMC is enabled this
+patch converts this horrible horrible hack into a horrible hack by using
+dev->resume() (untested).
+
+Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
+---
+ arch/arm/mach-s3c2440/mach-gta02.c | 6 +++---
+ drivers/mfd/glamo/glamo-mci.c | 4 +---
+ 2 files changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
+index c15f072..435378a 100644
+--- a/arch/arm/mach-s3c2440/mach-gta02.c
++++ b/arch/arm/mach-s3c2440/mach-gta02.c
+@@ -1417,12 +1417,12 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev)
+
+ static void gta02_glamo_mci_suspending(struct platform_device *dev)
+ {
+- void glamo_mci_resume(void *dev); /* little white lies about types */
+-
+- resume_dep_glamo_mci_pcf.callback = glamo_mci_resume;
++#if defined(CONFIG_MFD_GLAMO_MCI) && defined(CONFIG_PM)
++ resume_dep_glamo_mci_pcf.callback = (void *)dev->dev.driver->resume;
+ resume_dep_glamo_mci_pcf.context = (void *)dev;
+ pcf50633_register_resume_dependency(pcf50633_global,
+ &resume_dep_glamo_mci_pcf);
++#endif
+ }
+
+
+diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
+index cff43db..d5099a0 100644
+--- a/drivers/mfd/glamo/glamo-mci.c
++++ b/drivers/mfd/glamo/glamo-mci.c
+@@ -1006,7 +1006,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
+ return ret;
+ }
+
+-int glamo_mci_resume(struct platform_device *dev)
++static int glamo_mci_resume(struct platform_device *dev)
+ {
+ struct mmc_host *mmc = platform_get_drvdata(dev);
+ struct glamo_mci_host *host = mmc_priv(mmc);
+@@ -1025,8 +1025,6 @@ int glamo_mci_resume(struct platform_device *dev)
+
+ return ret;
+ }
+-EXPORT_SYMBOL_GPL(glamo_mci_resume);
+-
+
+ #else /* CONFIG_PM */
+ #define glamo_mci_suspend NULL
+--
+1.5.6.5
+