git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
drivers
/
clocksource
/
clps711x-timer.c
diff --git
a/drivers/clocksource/clps711x-timer.c
b/drivers/clocksource/clps711x-timer.c
index 84aed78261e46e6cf6427298fdc78a16790bf8d1..24db6d605549cec0a4f0e611be0de44161b98b84 100644
(file)
--- a/
drivers/clocksource/clps711x-timer.c
+++ b/
drivers/clocksource/clps711x-timer.c
@@
-119,5
+119,5
@@
static int __init clps711x_timer_init(struct device_node *np)
return -EINVAL;
}
}
-CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,
clps711x
-timer", clps711x_timer_init);
+CLOCKSOURCE_OF_DECLARE(clps711x, "cirrus,
ep7209
-timer", clps711x_timer_init);
#endif