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
vserver 1.9.5.x5
[linux-2.6.git]
/
drivers
/
macintosh
/
via-cuda.c
diff --git
a/drivers/macintosh/via-cuda.c
b/drivers/macintosh/via-cuda.c
index
7072313
..
417deb5
100644
(file)
--- a/
drivers/macintosh/via-cuda.c
+++ b/
drivers/macintosh/via-cuda.c
@@
-32,8
+32,8
@@
#include <asm/system.h>
#include <linux/init.h>
#include <asm/system.h>
#include <linux/init.h>
-static volatile unsigned char *via;
-static
spinlock_t cuda_lock = SPIN_LOCK_UNLOCKED
;
+static volatile unsigned char
__iomem
*via;
+static
DEFINE_SPINLOCK(cuda_lock)
;
#ifdef CONFIG_MAC
#define CUDA_IRQ IRQ_MAC_ADB
#ifdef CONFIG_MAC
#define CUDA_IRQ IRQ_MAC_ADB
@@
-160,7
+160,7
@@
find_via_cuda(void)
if (vias->n_addrs < 1 || vias->n_intrs < 1)
return 0;
}
if (vias->n_addrs < 1 || vias->n_intrs < 1)
return 0;
}
- via =
(volatile unsigned char *)
ioremap(vias->addrs->address, 0x2000);
+ via = ioremap(vias->addrs->address, 0x2000);
cuda_state = idle;
sys_ctrler = SYS_CTRLER_CUDA;
cuda_state = idle;
sys_ctrler = SYS_CTRLER_CUDA;