git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
vr41xx
/
common
/
cmu.c
diff --git
a/arch/mips/vr41xx/common/cmu.c
b/arch/mips/vr41xx/common/cmu.c
index
fcd3cb8
..
657c513
100644
(file)
--- a/
arch/mips/vr41xx/common/cmu.c
+++ b/
arch/mips/vr41xx/common/cmu.c
@@
-3,7
+3,7
@@
*
* Copyright (C) 2001-2002 MontaVista Software Inc.
* Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
*
* Copyright (C) 2001-2002 MontaVista Software Inc.
* Author: Yoichi Yuasa <yyuasa@mvista.com or source@mvista.com>
- * Copuright (C) 2003-2005 Yoichi Yuasa <y
uasa@hh.iij4u.or
.jp>
+ * Copuright (C) 2003-2005 Yoichi Yuasa <y
oichi_yuasa@tripeaks.co
.jp>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-25,7
+25,7
@@
* - New creation, NEC VR4122 and VR4131 are supported.
* - Added support for NEC VR4111 and VR4121.
*
* - New creation, NEC VR4122 and VR4131 are supported.
* - Added support for NEC VR4111 and VR4121.
*
- * Yoichi Yuasa <y
uasa@hh.iij4u.or
.jp>
+ * Yoichi Yuasa <y
oichi_yuasa@tripeaks.co
.jp>
* - Added support for NEC VR4133.
*/
#include <linux/init.h>
* - Added support for NEC VR4133.
*/
#include <linux/init.h>
@@
-69,7
+69,7
@@
static void __iomem *cmu_base;
static uint16_t cmuclkmsk, cmuclkmsk2;
static void __iomem *cmu_base;
static uint16_t cmuclkmsk, cmuclkmsk2;
-static
spinlock_t cmu_lock
;
+static
DEFINE_SPINLOCK(cmu_lock)
;
#define cmu_read(offset) readw(cmu_base + (offset))
#define cmu_write(offset, value) writew((value), cmu_base + (offset))
#define cmu_read(offset) readw(cmu_base + (offset))
#define cmu_write(offset, value) writew((value), cmu_base + (offset))