target/linux/s3c24xx/patches-2.6.24/1293-fix-build-with-no-CONFIG_MMC.patch

   1 From 968c41d0c32099d78927849a71e2ef3143cc05e7 Mon Sep 17 00:00:00 2001
   2 From: Andrzej Zaborowski <balrog@zabor.org>
   3 Date: Mon, 22 Sep 2008 23:01:47 +0100
   4 Subject: [PATCH] fix-build-with-no-CONFIG_MMC
   5
   6 I hit this when updating to 2.6.26.  Also if CONFIG_MMC is enabled this
   7 patch converts this horrible horrible hack into a horrible hack by using
   8 dev->resume() (untested).
   9
  10 Signed-off-by: Andrzej Zaborowski <balrog@zabor.org>
  11 ---
  12  arch/arm/mach-s3c2440/mach-gta02.c |    6 +++---
  13  drivers/mfd/glamo/glamo-mci.c      |    4 +---
  14  2 files changed, 4 insertions(+), 6 deletions(-)
  15
  16 diff --git a/arch/arm/mach-s3c2440/mach-gta02.c b/arch/arm/mach-s3c2440/mach-gta02.c
  17 index c15f072..435378a 100644
  18 --- a/arch/arm/mach-s3c2440/mach-gta02.c
  19 +++ b/arch/arm/mach-s3c2440/mach-gta02.c
  20 @@ -1417,12 +1417,12 @@ static int gta02_glamo_mci_all_dependencies_resumed(struct platform_device *dev)
  21
  22  static void gta02_glamo_mci_suspending(struct platform_device *dev)
  23  {
  24 -       void glamo_mci_resume(void *dev); /* little white lies about types */
  25 -
  26 -       resume_dep_glamo_mci_pcf.callback = glamo_mci_resume;
  27 +#if defined(CONFIG_MFD_GLAMO_MCI) && defined(CONFIG_PM)
  28 +       resume_dep_glamo_mci_pcf.callback = (void *)dev->dev.driver->resume;
  29         resume_dep_glamo_mci_pcf.context = (void *)dev;
  30         pcf50633_register_resume_dependency(pcf50633_global,
  31                                                      &resume_dep_glamo_mci_pcf);
  32 +#endif
  33  }
  34
  35
  36 diff --git a/drivers/mfd/glamo/glamo-mci.c b/drivers/mfd/glamo/glamo-mci.c
  37 index cff43db..d5099a0 100644
  38 --- a/drivers/mfd/glamo/glamo-mci.c
  39 +++ b/drivers/mfd/glamo/glamo-mci.c
  40 @@ -1006,7 +1006,7 @@ static int glamo_mci_suspend(struct platform_device *dev, pm_message_t state)
  41         return ret;
  42  }
  43
  44 -int glamo_mci_resume(struct platform_device *dev)
  45 +static int glamo_mci_resume(struct platform_device *dev)
  46  {
  47         struct mmc_host *mmc = platform_get_drvdata(dev);
  48         struct glamo_mci_host   *host = mmc_priv(mmc);
  49 @@ -1025,8 +1025,6 @@ int glamo_mci_resume(struct platform_device *dev)
  50
  51         return ret;
  52  }
  53 -EXPORT_SYMBOL_GPL(glamo_mci_resume);
  54 -
  55
  56  #else /* CONFIG_PM */
  57  #define glamo_mci_suspend NULL
  58 --
  59 1.5.6.5
  60