diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-02-27 05:50:23 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene@kernel.org> | 2015-02-27 05:50:23 +0900 |
| commit | 1fe054e71a895c682f1cd36071ff3fd0c7bc9cff (patch) | |
| tree | 13716a35f470eb23ea340e6dd9ae135b2c20f0d0 /arch/arm/plat-samsung/pm.c | |
| parent | 4f506daf0e6c094d2f28253d4044e9adc9461142 (diff) | |
| download | linux-1fe054e71a895c682f1cd36071ff3fd0c7bc9cff.tar.gz linux-1fe054e71a895c682f1cd36071ff3fd0c7bc9cff.tar.bz2 linux-1fe054e71a895c682f1cd36071ff3fd0c7bc9cff.zip | |
ARM: S3C24XX: fix header file inclusions
The pm-core.h file does not include all the necessary headers,
and has a static declaration for a function that is not
defined in the same file, causing SAMSUNG_PM_DEBUG to
break on s3c24xx:
arch/arm/mach-s3c24xx/include/mach/pm-core.h:50:91: warning: 's3c_pm_show_resume_irqs' used but never defined
arch/arm/mach-s3c24xx/include/mach/pm-core.h: In function 's3c_pm_debug_init_uart':
arch/arm/mach-s3c24xx/include/mach/pm-core.h:16:34: error: 'S3C2410_CLKCON' undeclared (first use in this function)
unsigned long tmp = __raw_readl(S3C2410_CLKCON);
^
This moves the code around slightly to avoid the errors.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
Diffstat (limited to 'arch/arm/plat-samsung/pm.c')
| -rw-r--r-- | arch/arm/plat-samsung/pm.c | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/arch/arm/plat-samsung/pm.c b/arch/arm/plat-samsung/pm.c index f8c0f9797dcf..82777c649774 100644 --- a/arch/arm/plat-samsung/pm.c +++ b/arch/arm/plat-samsung/pm.c @@ -65,26 +65,6 @@ int s3c_irqext_wake(struct irq_data *data, unsigned int state) return 0; } -/* s3c2410_pm_show_resume_irqs - * - * print any IRQs asserted at resume time (ie, we woke from) -*/ -static void __maybe_unused s3c_pm_show_resume_irqs(int start, - unsigned long which, - unsigned long mask) -{ - int i; - - which &= ~mask; - - for (i = 0; i <= 31; i++) { - if (which & (1L<<i)) { - S3C_PMDBG("IRQ %d asserted at resume\n", start+i); - } - } -} - - void (*pm_cpu_prep)(void); int (*pm_cpu_sleep)(unsigned long); |