diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-11 20:20:07 -0500 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-03-11 20:20:07 -0500 |
| commit | be7004f73d0b42cca29cf9f1cc86f32038fd140c (patch) | |
| tree | 906bfde445dd4d94e1487888440dfc31391dae30 /arch/arm/plat-samsung | |
| parent | 604eefeb2308cda72325fd8754aecb55075ae866 (diff) | |
| parent | 30fe76437bc2463b25e9a64ff1b28f293e3f3413 (diff) | |
Merge branch 'next-exynos4-pm' into for-next
Conflicts:
arch/arm/mach-exynos4/include/mach/regs-pmu.h
Diffstat (limited to 'arch/arm/plat-samsung')
| -rw-r--r-- | arch/arm/plat-samsung/include/plat/cpu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/cpu.h b/arch/arm/plat-samsung/include/plat/cpu.h index 9addb3dfb4bc..cedfff51c82b 100644 --- a/arch/arm/plat-samsung/include/plat/cpu.h +++ b/arch/arm/plat-samsung/include/plat/cpu.h | |||
| @@ -82,6 +82,7 @@ extern struct sysdev_class s3c64xx_sysclass; | |||
| 82 | extern struct sysdev_class s5p64x0_sysclass; | 82 | extern struct sysdev_class s5p64x0_sysclass; |
| 83 | extern struct sysdev_class s5p6442_sysclass; | 83 | extern struct sysdev_class s5p6442_sysclass; |
| 84 | extern struct sysdev_class s5pv210_sysclass; | 84 | extern struct sysdev_class s5pv210_sysclass; |
| 85 | extern struct sysdev_class exynos4_sysclass; | ||
| 85 | 86 | ||
| 86 | extern void (*s5pc1xx_idle)(void); | 87 | extern void (*s5pc1xx_idle)(void); |
| 87 | 88 | ||