summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Figa <tomasz.figa@gmail.com>2013-01-09 17:13:23 -0800
committerKukjin Kim <kgene.kim@samsung.com>2013-01-16 15:45:52 -0800
commitc0d6cfd3007c16f03b74bfc5ab80d8ab47402fff (patch)
tree0c6082dccd2c2f15a560aa75a92fcc679e0df7e1
parent9931faca02c604c22335f5a935a501bb2ace6e20 (diff)
downloadlinux-3.10-c0d6cfd3007c16f03b74bfc5ab80d8ab47402fff.tar.gz
linux-3.10-c0d6cfd3007c16f03b74bfc5ab80d8ab47402fff.tar.bz2
linux-3.10-c0d6cfd3007c16f03b74bfc5ab80d8ab47402fff.zip
ARM: S3C64XX: Fix build error with CONFIG_S3C_DEV_FB disabled
If there is no board selecting CONFIG_S3C_DEV_FB enabled, build will fail on arch/arm/mach-s3c64xx/pm.c, where s3c_device_fb is referenced. This patch adds ifdef guard around the code making it compile only when CONFIG_S3C_DEV_FB is enabled. Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r--arch/arm/mach-s3c64xx/pm.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c
index 7feb426fc20..d2e1a16690b 100644
--- a/arch/arm/mach-s3c64xx/pm.c
+++ b/arch/arm/mach-s3c64xx/pm.c
@@ -338,8 +338,10 @@ int __init s3c64xx_pm_init(void)
for (i = 0; i < ARRAY_SIZE(s3c64xx_pm_domains); i++)
pm_genpd_init(&s3c64xx_pm_domains[i]->pd, NULL, false);
+#ifdef CONFIG_S3C_DEV_FB
if (dev_get_platdata(&s3c_device_fb.dev))
pm_genpd_add_device(&s3c64xx_pm_f.pd, &s3c_device_fb.dev);
+#endif
return 0;
}