projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-3.8' of git://linux-nfs.org/~bfields/linux
[cascardo/linux.git]
/
arch
/
arm
/
mach-davinci
/
da850.c
diff --git
a/arch/arm/mach-davinci/da850.c
b/arch/arm/mach-davinci/da850.c
index
68c5fe0
..
6b9154e
100644
(file)
--- a/
arch/arm/mach-davinci/da850.c
+++ b/
arch/arm/mach-davinci/da850.c
@@
-403,7
+403,7
@@
static struct clk_lookup da850_clks[] = {
CLK(NULL, "rmii", &rmii_clk),
CLK("davinci_emac.1", NULL, &emac_clk),
CLK("davinci-mcasp.0", NULL, &mcasp_clk),
CLK(NULL, "rmii", &rmii_clk),
CLK("davinci_emac.1", NULL, &emac_clk),
CLK("davinci-mcasp.0", NULL, &mcasp_clk),
- CLK("da8xx_lcdc.0",
NULL,
&lcdc_clk),
+ CLK("da8xx_lcdc.0",
"fck",
&lcdc_clk),
CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
CLK(NULL, "aemif", &aemif_clk),
CLK("davinci_mmc.0", NULL, &mmcsd0_clk),
CLK("davinci_mmc.1", NULL, &mmcsd1_clk),
CLK(NULL, "aemif", &aemif_clk),