diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-26 09:06:30 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-01-26 09:06:30 +0400 |
| commit | 422d26b6ecd77af8c77f2a40580679459825170f (patch) | |
| tree | 632e690e458fb7b27db200cd6fcd5429e143e419 /arch/arm/mach-s3c64xx/pm.c | |
| parent | 4c271bb67c04253c1e99006eb48fb773a8fe8c0f (diff) | |
| parent | 949db153b6466c6f7cad5a427ecea94985927311 (diff) | |
| download | linux-422d26b6ecd77af8c77f2a40580679459825170f.tar.xz | |
Merge 3.8-rc5 into driver-core-next
This resolves a gpio driver merge issue pointed out in linux-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-s3c64xx/pm.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/pm.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/pm.c b/arch/arm/mach-s3c64xx/pm.c index 7feb426fc202..d2e1a16690bd 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; } |