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 branches 'irq-core-for-linus' and 'core-locking-for-linus' of git://git.kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-shmobile
/
setup-sh7367.c
diff --git
a/arch/arm/mach-shmobile/setup-sh7367.c
b/arch/arm/mach-shmobile/setup-sh7367.c
index
3148c11
..
003008c
100644
(file)
--- a/
arch/arm/mach-shmobile/setup-sh7367.c
+++ b/
arch/arm/mach-shmobile/setup-sh7367.c
@@
-154,7
+154,6
@@
static struct sh_timer_config cmt10_platform_data = {
.name = "CMT10",
.channel_offset = 0x10,
.timer_bit = 0,
.name = "CMT10",
.channel_offset = 0x10,
.timer_bit = 0,
- .clk = "r_clk",
.clockevent_rating = 125,
.clocksource_rating = 125,
};
.clockevent_rating = 125,
.clocksource_rating = 125,
};