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 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm
[pandora-kernel.git]
/
arch
/
sh
/
kernel
/
cpu
/
sh4a
/
setup-sh7366.c
diff --git
a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c
index
1d897ed
..
8dab9e1
100644
(file)
--- a/
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
+++ b/
arch/sh/kernel/cpu/sh4a/setup-sh7366.c
@@
-170,7
+170,6
@@
static struct platform_device veu1_device = {
static struct sh_timer_config cmt_platform_data = {
.channel_offset = 0x60,
.timer_bit = 5,
static struct sh_timer_config cmt_platform_data = {
.channel_offset = 0x60,
.timer_bit = 5,
- .clk = "cmt0",
.clockevent_rating = 125,
.clocksource_rating = 200,
};
.clockevent_rating = 125,
.clocksource_rating = 200,
};
@@
-200,7
+199,6
@@
static struct platform_device cmt_device = {
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
static struct sh_timer_config tmu0_platform_data = {
.channel_offset = 0x04,
.timer_bit = 0,
- .clk = "tmu0",
.clockevent_rating = 200,
};
.clockevent_rating = 200,
};
@@
-229,7
+227,6
@@
static struct platform_device tmu0_device = {
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
static struct sh_timer_config tmu1_platform_data = {
.channel_offset = 0x10,
.timer_bit = 1,
- .clk = "tmu0",
.clocksource_rating = 200,
};
.clocksource_rating = 200,
};
@@
-258,7
+255,6
@@
static struct platform_device tmu1_device = {
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1c,
.timer_bit = 2,
static struct sh_timer_config tmu2_platform_data = {
.channel_offset = 0x1c,
.timer_bit = 2,
- .clk = "tmu0",
};
static struct resource tmu2_resources[] = {
};
static struct resource tmu2_resources[] = {