diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 07:56:44 -0500 |
| commit | 4045407fd7740642b18bc802e8bab064e79a61e5 (patch) | |
| tree | 9412a38886bfad562bc5897c6e4c23bb88703204 /arch/arm/mach-s5p64x0/clock-s5p6440.c | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f (diff) | |
| parent | 4c5f830c4c9d4f19c1eef356c0cd322b46d695c9 (diff) | |
Merge branch 'restart-cleanup' into restart
Conflicts:
arch/arm/kernel/setup.c
Diffstat (limited to 'arch/arm/mach-s5p64x0/clock-s5p6440.c')
| -rw-r--r-- | arch/arm/mach-s5p64x0/clock-s5p6440.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c index c54c65d511f0..dd2b8daef0cd 100644 --- a/arch/arm/mach-s5p64x0/clock-s5p6440.c +++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c | |||
| @@ -31,7 +31,8 @@ | |||
| 31 | #include <plat/pll.h> | 31 | #include <plat/pll.h> |
| 32 | #include <plat/s5p-clock.h> | 32 | #include <plat/s5p-clock.h> |
| 33 | #include <plat/clock-clksrc.h> | 33 | #include <plat/clock-clksrc.h> |
| 34 | #include <plat/s5p6440.h> | 34 | |
| 35 | #include "common.h" | ||
| 35 | 36 | ||
| 36 | static u32 epll_div[][5] = { | 37 | static u32 epll_div[][5] = { |
| 37 | { 36000000, 0, 48, 1, 4 }, | 38 | { 36000000, 0, 48, 1, 4 }, |