Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 620a245978d007279bc5c7c64e15f5f63af9af98

Authored by Guido Guenther
Committed by Paul Mackerras
1 parent fa19d63488
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] Fix build of modular drivers/macintosh/apm_emu.c 

Currently, if drivers/macintosh/apm_emu is a module and the config
doesn't have CONFIG_SUSPEND we get:

ERROR: "pmu_batteries" [drivers/macintosh/apm_emu.ko] undefined!
ERROR: "pmu_battery_count" [drivers/macintosh/apm_emu.ko] undefined!
ERROR: "pmu_power_flags" [drivers/macintosh/apm_emu.ko] undefined!

on PPC32.  The variables aren't wrapped in '#if defined(CONFIG_SUSPEND)'
so we probably shouldn't wrap the exports either.  This removes the
CONFIG_SUSPEND part of the export, which fixes compilation on ppc32.

Signed-off-by: Guido Guenther <agx@sigxcpu.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

drivers/macintosh/via-pmu.c
Diff comments   View file @ 620a245
... ... @@ -2528,7 +2528,7 @@
2528 2528 EXPORT_SYMBOL(pmu_suspend);
2529 2529 EXPORT_SYMBOL(pmu_resume);
2530 2530 EXPORT_SYMBOL(pmu_unlock);
2531   -#if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC32)
  2531 +#if defined(CONFIG_PPC32)
2532 2532 EXPORT_SYMBOL(pmu_enable_irled);
2533 2533 EXPORT_SYMBOL(pmu_battery_count);
2534 2534 EXPORT_SYMBOL(pmu_batteries);