diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-09-19 20:09:27 -0400 |
| commit | 0ce49a3945474fc942ec37c0c0efece60f592f80 (patch) | |
| tree | f42b821b2d9e2d8775bc22f56d444c2cc7b7b7dd /arch/mips/dec/setup.c | |
| parent | 9e4859ef5462193643fd2b3c8ffb298e5a4a4319 (diff) | |
| parent | a88a8eff1e6e32d3288986a9d36c6a449c032d3a (diff) | |
Merge branch 'linux-2.6'
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 | ||