diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 15:08:43 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2011-01-31 15:09:14 +0100 |
| commit | 51563cd53c4b1c1790fccd2e0af0e2b756589af9 (patch) | |
| tree | d2fedfc654ab4fa011feaca262f95481a89e232a /arch/m68k/atari/config.c | |
| parent | d123375425d7df4b6081a631fc1203fceafa59b2 (diff) | |
| parent | 8161239a8bcce9ad6b537c04a1fa3b5c68bae693 (diff) | |
Merge branch 'tip/rtmutex' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into core/locking
*git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace tip/rtmutex:
rtmutex: Simplify PI algorithm and make highest prio task get lock
Diffstat (limited to 'arch/m68k/atari/config.c')
| -rw-r--r-- | arch/m68k/atari/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c index ae2d96e5d618..4203d101363c 100644 --- 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 "); } |