diff options
| author | Olof Johansson <olof@lixom.net> | 2012-02-06 08:31:33 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-02-06 08:31:33 -0800 |
| commit | ab74a91429ed3e10b27632e22ff681be90d9cd0d (patch) | |
| tree | 269f647823dc06d70054bfe0fc51418c318c4802 /arch/arm/mach-exynos/clock-exynos4210.c | |
| parent | ca43784daa7a400407d851799ac69d3de2b2ab4e (diff) | |
| parent | 3e8ad5610c07f88bdecf94468929c86631be476f (diff) | |
| download | talos-op-linux-ab74a91429ed3e10b27632e22ff681be90d9cd0d.tar.gz talos-op-linux-ab74a91429ed3e10b27632e22ff681be90d9cd0d.zip | |
Merge branch 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into fixes
* 'v3.3-samsung-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Correct M-5MOLS sensor clock frequency on Universal C210 board
ARM: EXYNOS: Correct framebuffer window size on Nuri board
ARM: SAMSUNG: Fix missing api-change from subsys_interface change
ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type"
ARM: S5PV210: Fix the name of exynos4_clk_hdmiphy_ctrl() for S5PV210
ARM: EXYNOS: Remove build warning without enabling PM
ARM: SAMSUNG: Fix platform data setup for I2C adapter 0
ARM: EXYNOS: fix non-SMP builds for EXYNOS4
ARM: S3C6410: Use device names for both I2C clocks
ARM: S3C64XX: Make s3c64xx_init_uarts() static
Diffstat (limited to 'arch/arm/mach-exynos/clock-exynos4210.c')
| -rw-r--r-- | arch/arm/mach-exynos/clock-exynos4210.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/clock-exynos4210.c b/arch/arm/mach-exynos/clock-exynos4210.c index a5823a7f249e..13312ccb2d93 100644 --- a/arch/arm/mach-exynos/clock-exynos4210.c +++ b/arch/arm/mach-exynos/clock-exynos4210.c @@ -32,6 +32,7 @@ #include "common.h" +#ifdef CONFIG_PM_SLEEP static struct sleep_save exynos4210_clock_save[] = { SAVE_ITEM(S5P_CLKSRC_IMAGE), SAVE_ITEM(S5P_CLKSRC_LCD1), @@ -42,6 +43,7 @@ static struct sleep_save exynos4210_clock_save[] = { SAVE_ITEM(S5P_CLKGATE_IP_LCD1), SAVE_ITEM(S5P_CLKGATE_IP_PERIR_4210), }; +#endif static struct clksrc_clk *sysclks[] = { /* nothing here yet */ |
