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
/
mtd
/
maps
/
cstm_mips_ixx.c
diff --git
a/drivers/mtd/maps/cstm_mips_ixx.c
b/drivers/mtd/maps/cstm_mips_ixx.c
index
773b1ba
..
ae9252f
100644
(file)
--- a/
drivers/mtd/maps/cstm_mips_ixx.c
+++ b/
drivers/mtd/maps/cstm_mips_ixx.c
@@
-1,5
+1,5
@@
/*
/*
- * $Id: cstm_mips_ixx.c,v 1.1
0 2004/07/12 21:59:43 dwmw2
Exp $
+ * $Id: cstm_mips_ixx.c,v 1.1
2 2004/11/04 13:24:14 gleixner
Exp $
*
* Mapping of a custom board with both AMD CFI and JEDEC flash in partitions.
* Config with both CFI and JEDEC device support.
*
* Mapping of a custom board with both AMD CFI and JEDEC flash in partitions.
* Config with both CFI and JEDEC device support.
@@
-58,7
+58,7
@@
#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
void cstm_mips_ixx_set_vpp(struct map_info *map,int vpp)
{
#if defined(CONFIG_MIPS_ITE8172) || defined(CONFIG_MIPS_IVR)
void cstm_mips_ixx_set_vpp(struct map_info *map,int vpp)
{
- static
spinlock_t vpp_lock = SPIN_LOCK_UNLOCKED
;
+ static
DEFINE_SPINLOCK(vpp_lock)
;
static int vpp_count = 0;
unsigned long flags;
static int vpp_count = 0;
unsigned long flags;
@@
-170,7
+170,7
@@
int __init init_cstm_mips_ixx(void)
cstm_mips_ixx_map[i].phys = cstm_mips_ixx_board_desc[i].window_addr;
cstm_mips_ixx_map[i].phys = cstm_mips_ixx_board_desc[i].window_addr;
- cstm_mips_ixx_map[i].virt =
(unsigned long)
ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
+ cstm_mips_ixx_map[i].virt = ioremap(cstm_mips_ixx_board_desc[i].window_addr, cstm_mips_ixx_board_desc[i].window_size);
if (!cstm_mips_ixx_map[i].virt) {
printk(KERN_WARNING "Failed to ioremap\n");
return -EIO;
if (!cstm_mips_ixx_map[i].virt) {
printk(KERN_WARNING "Failed to ioremap\n");
return -EIO;