diff options
| author | Kevin Hilman <khilman@ti.com> | 2012-11-14 16:54:27 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-14 17:06:20 -0800 |
| commit | 936407358759adb302df93ab61fa68141897270c (patch) | |
| tree | ade92c2f6db1f68ffaab6bd5be4227c63b3c3ba4 /arch/arm/mach-omap2/omap-smp.c | |
| parent | b1d2037a6c3c754ef7f527249ab2e1dee51e73dd (diff) | |
| download | linux-936407358759adb302df93ab61fa68141897270c.tar.gz linux-936407358759adb302df93ab61fa68141897270c.tar.bz2 linux-936407358759adb302df93ab61fa68141897270c.zip | |
ARM: OMAP4: PM: fix errata handling when CONFIG_PM=n
commit c9621844 (ARM: OMAP4: PM: add errata support) introduced errata
handling for OMAP4, but was broken when CONFIG_PM=n.
When CONFIG_PM=n, pm44xx.c is not compiled, yet that is where pm44xx_errata
is defined. However, these errata are needed for the SMP boot/hotplug case
also, and are primarily used in omap-smp.c.
Move the definition of pm44xx_errata to omap-smp.c so that it's available
even in the CONFIG_PM=n case.
Cc: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Kevin Hilman <khilman@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap-smp.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap-smp.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c index 49a08dfe8d88..cd42d921940d 100644 --- a/arch/arm/mach-omap2/omap-smp.c +++ b/arch/arm/mach-omap2/omap-smp.c @@ -40,6 +40,8 @@ #define OMAP5_CORE_COUNT 0x2 +u16 pm44xx_errata; + /* SCU base address */ static void __iomem *scu_base; |