diff options
| author | Magnus Damm <damm+renesas@opensource.se> | 2014-08-25 05:04:01 +0200 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2014-09-02 02:32:06 +0200 |
| commit | abebbc4a026d8cdceb9f65c497b3db445c8ff5e7 (patch) | |
| tree | a602cbfc386a582e2eacfecc31bef3f8e60d2aad /arch/arm/mach-shmobile/pm-rmobile.h | |
| parent | ARM: shmobile: Cleanup pm-rcar.o build using Kconfig (diff) | |
| download | linux-abebbc4a026d8cdceb9f65c497b3db445c8ff5e7.tar.xz linux-abebbc4a026d8cdceb9f65c497b3db445c8ff5e7.zip | |
ARM: shmobile: Cleanup pm-rmobile.o build using Kconfig
Add a CONFIG_PM_RMOBILE entry and enable it for R-Mobile
SoCs in case CONFIG_PM is set. Consolidate Makefile power
management objects and get rid of #ifdefs in the C code.
Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/arm/mach-shmobile/pm-rmobile.h')
| -rw-r--r-- | arch/arm/mach-shmobile/pm-rmobile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/pm-rmobile.h b/arch/arm/mach-shmobile/pm-rmobile.h index 690553a06887..8f66b343162b 100644 --- a/arch/arm/mach-shmobile/pm-rmobile.h +++ b/arch/arm/mach-shmobile/pm-rmobile.h @@ -36,7 +36,7 @@ struct pm_domain_device { struct platform_device *pdev; }; -#ifdef CONFIG_PM +#ifdef CONFIG_PM_RMOBILE extern void rmobile_init_domains(struct rmobile_pm_domain domains[], int num); extern void rmobile_add_device_to_domain_td(const char *domain_name, struct platform_device *pdev, @@ -58,6 +58,6 @@ extern void rmobile_add_devices_to_domains(struct pm_domain_device data[], static inline void rmobile_add_devices_to_domains(struct pm_domain_device d[], int size) {} -#endif /* CONFIG_PM */ +#endif /* CONFIG_PM_RMOBILE */ #endif /* PM_RMOBILE_H */ |