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 'sh/wdt', 'sh/pci-express-async' and 'common/serial-rework' into sh...
[pandora-kernel.git]
/
arch
/
m68k
/
atari
/
config.c
diff --git
a/arch/m68k/atari/config.c
b/arch/m68k/atari/config.c
index
ae2d96e
..
4203d10
100644
(file)
--- a/
arch/m68k/atari/config.c
+++ b/
arch/m68k/atari/config.c
@@
-315,7
+315,7
@@
void __init config_atari(void)
ATARIHW_SET(SCC_DMA);
printk("SCC_DMA ");
}
- if (scc_test(&scc.cha_a_ctrl)) {
+ if (scc_test(&
atari_
scc.cha_a_ctrl)) {
ATARIHW_SET(SCC);
printk("SCC ");
}