diff options
| author | Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2011-04-06 13:26:06 -0400 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2011-05-06 02:40:54 -0400 |
| commit | e0c199d0989e2f9fa2683e817624779f55abfa7f (patch) | |
| tree | e5b850f14b9811d6ca5276d443328a063915b32a /arch/arm/mach-davinci/da850.c | |
| parent | 5a9f68fd2608384e09e18767ebc253d7aee86b34 (diff) | |
DA8xx: kill duplicate #define DA8XX_PLL1_BASE
Commit 044ca01521d077a35b46a445b02b93f413109a4b (davinci: da850/omap-l138: add
support for SoC suspend) introduced DA8XX_PLL1_BASE despite PLL1 exists only on
DA850/OMAP-L138 and da850.c even already #define'd DA850_PLL1_BASE. Kill the
duplicate macro, renaming an existing reference to it...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Diffstat (limited to 'arch/arm/mach-davinci/da850.c')
| -rw-r--r-- | arch/arm/mach-davinci/da850.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index b95b9196deed..133aac405853 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c | |||
| @@ -1055,7 +1055,7 @@ int da850_register_pm(struct platform_device *pdev) | |||
| 1055 | if (!pdata->cpupll_reg_base) | 1055 | if (!pdata->cpupll_reg_base) |
| 1056 | return -ENOMEM; | 1056 | return -ENOMEM; |
| 1057 | 1057 | ||
| 1058 | pdata->ddrpll_reg_base = ioremap(DA8XX_PLL1_BASE, SZ_4K); | 1058 | pdata->ddrpll_reg_base = ioremap(DA850_PLL1_BASE, SZ_4K); |
| 1059 | if (!pdata->ddrpll_reg_base) { | 1059 | if (!pdata->ddrpll_reg_base) { |
| 1060 | ret = -ENOMEM; | 1060 | ret = -ENOMEM; |
| 1061 | goto no_ddrpll_mem; | 1061 | goto no_ddrpll_mem; |