diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:38 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:38 +0200 |
| commit | 537cd80cea370c530d455bc8e00ef0673ba165cb (patch) | |
| tree | 1fd73cbdd25d0f930b8dbf3be4842840ecece215 /arch/arm/mach-s3c64xx | |
| parent | 088eb2a84b3b093af60bbe0b65151e8a9cd2d57d (diff) | |
| parent | 42be66f857bac6f96fe3ebdf5cec05362c205430 (diff) | |
| download | talos-op-linux-537cd80cea370c530d455bc8e00ef0673ba165cb.tar.gz talos-op-linux-537cd80cea370c530d455bc8e00ef0673ba165cb.zip | |
Merge branch 'samsung/devel-2' into late/soc
From Kukjin Kim <kgene.kim@samsung.com>:
The updating cpufreq for 1.7GHz of exynos5250 has been included in samsung
tree because Rafael thought it was more related in samsung platform and
I agreed. And others are adding G2D clock for exynos4x12 Socs.
* samsung/devel-2:
ARM: S3C64XX: Add header file protection macros in pm-core.h
[CPUFREQ] EXYNOS5250: Add support max 1.7GHz for EXYNOS5250
ARM: EXYNOS: Add G2D related clock entries for SMDK4X12
ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file
Originally from
git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git next/devel-samsung-2
but rebased to split out the defconfig changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c64xx')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/pm-core.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/pm-core.h b/arch/arm/mach-s3c64xx/include/mach/pm-core.h index fcf3dcabb694..c0537f40a3d8 100644 --- a/arch/arm/mach-s3c64xx/include/mach/pm-core.h +++ b/arch/arm/mach-s3c64xx/include/mach/pm-core.h @@ -12,6 +12,9 @@ * published by the Free Software Foundation. */ +#ifndef __MACH_S3C64XX_PM_CORE_H +#define __MACH_S3C64XX_PM_CORE_H __FILE__ + #include <mach/regs-gpio.h> static inline void s3c_pm_debug_init_uart(void) @@ -113,3 +116,4 @@ static inline void samsung_pm_saved_gpios(void) __raw_writel(S3C64XX_SLPEN_USE_xSLP, S3C64XX_SLPEN); } +#endif /* __MACH_S3C64XX_PM_CORE_H */ |
