diff options
| author | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-01-04 19:17:33 -0500 |
| commit | 32032df6c2f6c9c6b2ada2ce42322231824f70c2 (patch) | |
| tree | b1ce838a37044bb38dfc128e2116ca35630e629a /arch/blackfin/mach-common/clocks-init.c | |
| parent | 22b737f4c75197372d64afc6ed1bccd58c00e549 (diff) | |
| parent | c5974b835a909ff15c3b7e6cf6789b5eb919f419 (diff) | |
Merge branch 'master' into percpu
Conflicts:
arch/powerpc/platforms/pseries/hvCall.S
include/linux/percpu.h
Diffstat (limited to 'arch/blackfin/mach-common/clocks-init.c')
| -rw-r--r-- | arch/blackfin/mach-common/clocks-init.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/blackfin/mach-common/clocks-init.c b/arch/blackfin/mach-common/clocks-init.c index ef6870e9eea6..d5cfe611b778 100644 --- a/arch/blackfin/mach-common/clocks-init.c +++ b/arch/blackfin/mach-common/clocks-init.c | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <asm/dma.h> | 13 | #include <asm/dma.h> |
| 14 | #include <asm/clocks.h> | 14 | #include <asm/clocks.h> |
| 15 | #include <asm/mem_init.h> | 15 | #include <asm/mem_init.h> |
| 16 | #include <asm/dpmc.h> | ||
| 16 | 17 | ||
| 17 | #define SDGCTL_WIDTH (1 << 31) /* SDRAM external data path width */ | 18 | #define SDGCTL_WIDTH (1 << 31) /* SDRAM external data path width */ |
| 18 | #define PLL_CTL_VAL \ | 19 | #define PLL_CTL_VAL \ |