diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-13 01:29:17 +0100 |
| commit | 3c1f67d60e2b4f4455563928999fd41cc653645d (patch) | |
| tree | 0d58c145a05fb09167f1ab6882b474eccb1f3563 /arch/blackfin/mach-common/clocks-init.c | |
| parent | 03d78913f01e8f6599823f00357ed17b32747d3d (diff) | |
| parent | 9ead64974b05501bbac0d63a47c99fa786d064ba (diff) | |
| download | op-kernel-dev-3c1f67d60e2b4f4455563928999fd41cc653645d.zip op-kernel-dev-3c1f67d60e2b4f4455563928999fd41cc653645d.tar.gz | |
Merge branch 'linus' into core/locking
Diffstat (limited to 'arch/blackfin/mach-common/clocks-init.c')
| -rw-r--r-- | arch/blackfin/mach-common/clocks-init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/blackfin/mach-common/clocks-init.c b/arch/blackfin/mach-common/clocks-init.c index 9dddb6f..3539365 100644 --- a/arch/blackfin/mach-common/clocks-init.c +++ b/arch/blackfin/mach-common/clocks-init.c @@ -17,7 +17,7 @@ #define SDGCTL_WIDTH (1 << 31) /* SDRAM external data path width */ #define PLL_CTL_VAL \ (((CONFIG_VCO_MULT & 63) << 9) | CLKIN_HALF | \ - (PLL_BYPASS << 8) | (ANOMALY_05000265 ? 0x8000 : 0)) + (PLL_BYPASS << 8) | (ANOMALY_05000305 ? 0 : 0x8000)) __attribute__((l1_text)) static void do_sync(void) |
