diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 14:45:32 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-09-19 14:45:32 -0400 |
| commit | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (patch) | |
| tree | ff58da14f35ec5596d2c3e82267394206f106a8c /arch/mips/dec/setup.c | |
| parent | c39c06b96175a75e63da38dc3557a69e18a5f8ac (diff) | |
| parent | 09abbcffb3ee63fb8712c008df0c6878860777b7 (diff) | |
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] cpu-bugs64.c: GCC 3.3 constraint workaround
[MIPS] DEC: Initialise ioasic_ssr_lock
Diffstat (limited to 'arch/mips/dec/setup.c')
| -rw-r--r-- | arch/mips/dec/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/dec/setup.c b/arch/mips/dec/setup.c index b8a5e75ba0ab..3e634f2f5443 100644 --- a/arch/mips/dec/setup.c +++ b/arch/mips/dec/setup.c | |||
| @@ -55,7 +55,7 @@ EXPORT_SYMBOL(dec_kn_slot_size); | |||
| 55 | 55 | ||
| 56 | int dec_tc_bus; | 56 | int dec_tc_bus; |
| 57 | 57 | ||
| 58 | spinlock_t ioasic_ssr_lock; | 58 | DEFINE_SPINLOCK(ioasic_ssr_lock); |
| 59 | 59 | ||
| 60 | volatile u32 *ioasic_base; | 60 | volatile u32 *ioasic_base; |
| 61 | 61 | ||