diff options
| author | Olof Johansson <olof@lixom.net> | 2012-03-13 19:08:06 -0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-03-13 19:08:06 -0400 |
| commit | e3643b77de143c5548ec93abd8aa68f4123295ea (patch) | |
| tree | 41981957bc93e8211fe55cd04b7cac47e74bc770 /arch/arm/mach-pxa/pxa25x.c | |
| parent | 86ca5b6fef2bf1aa77a62f29d844400e4fed8dde (diff) | |
| parent | 44b2cef5ae6da48523fa634230ca66107110a7dd (diff) | |
Merge branch 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup
* 'next/cleanup-exynos-clock' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: Add clock register addresses for EXYNOS4X12 bus devfreq driver
ARM: EXYNOS: add clock registers for exynos4x12-cpufreq
PM / devfreq: update the name of EXYNOS clock registers that were omitted
PM / devfreq: update the name of EXYNOS clock register
ARM: EXYNOS: change the prefix S5P_ to EXYNOS4_ for clock
ARM: EXYNOS: use static declaration on regarding clock
ARM: EXYNOS: replace clock.c for other new EXYNOS SoCs
(includes an update to v3.3-rc6)
Diffstat (limited to 'arch/arm/mach-pxa/pxa25x.c')
| -rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 91e4f6c03766..00d6eacab8e4 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
| @@ -25,7 +25,6 @@ | |||
| 25 | #include <linux/suspend.h> | 25 | #include <linux/suspend.h> |
| 26 | #include <linux/syscore_ops.h> | 26 | #include <linux/syscore_ops.h> |
| 27 | #include <linux/irq.h> | 27 | #include <linux/irq.h> |
| 28 | #include <linux/gpio.h> | ||
| 29 | 28 | ||
| 30 | #include <asm/mach/map.h> | 29 | #include <asm/mach/map.h> |
| 31 | #include <asm/suspend.h> | 30 | #include <asm/suspend.h> |