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
sections: fix section conflicts in arch/h8300
[sfrench/cifs-2.6.git]
/
arch
/
h8300
/
kernel
/
timer
/
tpu.c
diff --git
a/arch/h8300/kernel/timer/tpu.c
b/arch/h8300/kernel/timer/tpu.c
index 2193a2e2859af4fac6a33a9ba3e509416c64227d..0350f6204ecf4aa50e19f20cc897968c9f70f09e 100644
(file)
--- a/
arch/h8300/kernel/timer/tpu.c
+++ b/
arch/h8300/kernel/timer/tpu.c
@@
-66,7
+66,7
@@
static struct irqaction tpu_irq = {
.flags = IRQF_DISABLED | IRQF_TIMER,
};
-static const int __init
data
divide_rate[] = {
+static const int __init
const
divide_rate[] = {
#if CONFIG_H8300_TPU_CH == 0
1,4,16,64,0,0,0,0,
#elif (CONFIG_H8300_TPU_CH == 1) || (CONFIG_H8300_TPU_CH == 5)