diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:16:29 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-09 11:16:29 -0500 |
| commit | dcf7ec5ee62a78123057a1e286c88ca739717409 (patch) | |
| tree | fa3f19434638a942ba66d236dde4d9aaadf8b370 /arch/arm/mach-s5p64x0/clock-s5p6440.c | |
| parent | 15db3e823c3246e3bd31fe454f5c8927eb85caf2 (diff) | |
| parent | 142f2101a86ade2d6c9dfbedf82e1b5b31c8fce6 (diff) | |
Merge branch 'samsung/driver' into next/drivers
Conflicts:
arch/arm/mach-mxs/include/mach/common.h
Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
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 c041ad7fbd60..4b3023e8423a 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 }, |