diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 16:50:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-06-26 16:50:48 -0700 |
| commit | 6cd236e0057704d1f5c77908374079e021c83928 (patch) | |
| tree | 302e002d62dcd4663aef7e9a98ca4b019e3e5c98 /arch/mips/au1000/pb1500/board_setup.c | |
| parent | 2c9dbda360d96819456f845ea92e20e4e9d0ed36 (diff) | |
| parent | 8e15a0e35fdaf19e1aeb7923571e928bd6123cfd (diff) | |
| download | op-kernel-dev-6cd236e0057704d1f5c77908374079e021c83928.zip op-kernel-dev-6cd236e0057704d1f5c77908374079e021c83928.tar.gz | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Count timer interrupts correctly.
[MIPS] SMTC and non-SMTC kernel and modules are incompatible
[MIPS] EMMA2RH: Disable GEN_RTC, it can't possibly work.
[MIPS] Remove a duplicated local variable in test_and_clear_bit()
[MIPS] use compat_siginfo in rt_sigframe_n32
[MIPS] 20K: Handle WAIT related bugs according to errata information
[MIPS] AP/SP requires shadow registers, auto enable support.
[MIPS] Fix pb1500 reg B access
[MIPS] Alchemy: Fix wrong cast
[MIPS] remove "support for" from system type entry
[MIPS] add io_map_base to pci_controller on Cobalt
[MIPS] __ucmpdi2 arguments are unsigned long long.
Diffstat (limited to 'arch/mips/au1000/pb1500/board_setup.c')
| -rw-r--r-- | arch/mips/au1000/pb1500/board_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/au1000/pb1500/board_setup.c b/arch/mips/au1000/pb1500/board_setup.c index 0ffdb4f..c9b6556 100644 --- a/arch/mips/au1000/pb1500/board_setup.c +++ b/arch/mips/au1000/pb1500/board_setup.c @@ -125,7 +125,7 @@ void __init board_setup(void) au_writel((au_readl(0xac000028) | 0x20), 0xac000028); } /* Put the clock in BCD mode */ - if (readl(0xac00002C) & 0x4) { /* reg B */ + if (au_readl(0xac00002C) & 0x4) { /* reg B */ au_writel(au_readl(0xac00002c) & ~0x4, 0xac00002c); au_sync(); } |
