git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...
[pandora-kernel.git]
/
arch
/
arm
/
mach-ux500
/
clock.c
diff --git
a/arch/arm/mach-ux500/clock.c
b/arch/arm/mach-ux500/clock.c
index
d8ab7f1
..
1675047
100644
(file)
--- a/
arch/arm/mach-ux500/clock.c
+++ b/
arch/arm/mach-ux500/clock.c
@@
-477,6
+477,7
@@
static struct clk_lookup u8500_common_clks[] = {
CLK(sdi5, "sdi5", NULL),
CLK(uart2, "uart2", NULL),
CLK(ske, "ske", NULL),
+ CLK(ske, "nmk-ske-keypad", NULL),
CLK(sdi2, "sdi2", NULL),
CLK(i2c0, "nmk-i2c.0", NULL),
CLK(fsmc, "fsmc", NULL),