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 'fixes' of master.kernel.org:/home/rmk/linux-2.6-arm
[pandora-kernel.git]
/
arch
/
m68k
/
atari
/
ataints.c
diff --git
a/arch/m68k/atari/ataints.c
b/arch/m68k/atari/ataints.c
index
39478dd
..
26a804e
100644
(file)
--- a/
arch/m68k/atari/ataints.c
+++ b/
arch/m68k/atari/ataints.c
@@
-388,9
+388,9
@@
void __init atari_init_IRQ(void)
}
if (ATARIHW_PRESENT(SCC) && !atari_SCC_reset_done) {
}
if (ATARIHW_PRESENT(SCC) && !atari_SCC_reset_done) {
- scc.cha_a_ctrl = 9;
+
atari_
scc.cha_a_ctrl = 9;
MFPDELAY();
MFPDELAY();
- scc.cha_a_ctrl = (char) 0xc0; /* hardware reset */
+
atari_
scc.cha_a_ctrl = (char) 0xc0; /* hardware reset */
}
if (ATARIHW_PRESENT(SCU)) {
}
if (ATARIHW_PRESENT(SCU)) {