Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-s3c24xx / s3c2412.c

diff --git a/arch/arm/mach-s3c24xx/s3c2412.c b/arch/arm/mach-s3c24xx/s3c2412.c
index ecf2c77ab88b17c508417a928909af0bb0ec286d..64a13605cfc3d08b60bfb042fc7d6cba73882b34 100644 (file)
--- a/arch/arm/mach-s3c24xx/s3c2412.c
+++ b/arch/arm/mach-s3c24xx/s3c2412.c
@@ -172,7 +172,7 @@ int __init s3c2412_init(void)
 {
        printk("S3C2412: Initialising architecture\n");
 
-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
        register_syscore_ops(&s3c2412_pm_syscore_ops);
        register_syscore_ops(&s3c24xx_irq_syscore_ops);
 #endif