projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.15-rc1' into perf/urgent
[cascardo/linux.git]
/
arch
/
arm
/
mach-at91
/
at91sam9n12.c
diff --git
a/arch/arm/mach-at91/at91sam9n12.c
b/arch/arm/mach-at91/at91sam9n12.c
index
4ef088c
..
f2ea7b0
100644
(file)
--- a/
arch/arm/mach-at91/at91sam9n12.c
+++ b/
arch/arm/mach-at91/at91sam9n12.c
@@
-182,6
+182,7
@@
static struct clk_lookup periph_clocks_lookups[] = {
/* additional fake clock for macb_hclk */
CLKDEV_CON_DEV_ID("hclk", "500000.ohci", &uhp_clk),
CLKDEV_CON_DEV_ID("ohci_clk", "500000.ohci", &uhp_clk),
+ CLKDEV_CON_DEV_ID(NULL, "f8034000.pwm", &pwm_clk),
};
/*