diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-29 17:49:12 -0400 |
| commit | b0c4e148bd591629749d02a8fbc8d81c26d548cf (patch) | |
| tree | 3e2142635f3dc2ceeae870ead2dceab7b9c6def1 /arch/mips/vr41xx/common/vrc4173.c | |
| parent | 5615ca7906aefbdc3318604c89db5931d0a25910 (diff) | |
| parent | be15cd72d256e5eb3261a781b8507fac83ab33f6 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/vr41xx/common/vrc4173.c')
| -rw-r--r-- | arch/mips/vr41xx/common/vrc4173.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/vr41xx/common/vrc4173.c b/arch/mips/vr41xx/common/vrc4173.c index ba58764ef8ea..462a9af30eef 100644 --- a/arch/mips/vr41xx/common/vrc4173.c +++ b/arch/mips/vr41xx/common/vrc4173.c | |||
| @@ -81,8 +81,8 @@ EXPORT_SYMBOL(vrc4173_io_offset); | |||
| 81 | static int vrc4173_initialized; | 81 | static int vrc4173_initialized; |
| 82 | static uint16_t vrc4173_cmuclkmsk; | 82 | static uint16_t vrc4173_cmuclkmsk; |
| 83 | static uint16_t vrc4173_selectreg; | 83 | static uint16_t vrc4173_selectreg; |
| 84 | static spinlock_t vrc4173_cmu_lock; | 84 | static DEFINE_SPINLOCK(vrc4173_cmu_lock); |
| 85 | static spinlock_t vrc4173_giu_lock; | 85 | static DEFINE_SPINLOCK(vrc4173_giu_lock); |
| 86 | 86 | ||
| 87 | static inline void set_cmusrst(uint16_t val) | 87 | static inline void set_cmusrst(uint16_t val) |
| 88 | { | 88 | { |