diff options
author | ? <?> | 2005-06-20 08:22:55 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-06-29 08:34:01 -0400 |
commit | af2c80e926ad5335d00a8d507928aff4e8ff1877 (patch) | |
tree | 02b20b6be722e0852f720e691c3cb82376ea2e31 /drivers/mtd | |
parent | a4f957f16d41b9ff944dddd84c4892496a129f68 (diff) |
[MTD] ms02-nv: Fix 64bit operation
Replace KSEG1ADDR() with CKSEG1ADDR() as the former does not work for
64-bit configurations anymore.
Signed-off-by: Maciej W. Rozycki <macro@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'drivers/mtd')
-rw-r--r-- | drivers/mtd/devices/ms02-nv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c index 380ff08d29e4..f5026cee087f 100644 --- a/drivers/mtd/devices/ms02-nv.c +++ b/drivers/mtd/devices/ms02-nv.c | |||
@@ -6,7 +6,7 @@ | |||
6 | * as published by the Free Software Foundation; either version | 6 | * as published by the Free Software Foundation; either version |
7 | * 2 of the License, or (at your option) any later version. | 7 | * 2 of the License, or (at your option) any later version. |
8 | * | 8 | * |
9 | * $Id: ms02-nv.c,v 1.8 2005/01/05 18:05:12 dwmw2 Exp $ | 9 | * $Id: ms02-nv.c,v 1.10 2005/06/20 12:24:41 macro Exp $ |
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/init.h> | 12 | #include <linux/init.h> |
@@ -99,8 +99,8 @@ static inline uint ms02nv_probe_one(ulong addr) | |||
99 | * The firmware writes MS02NV_ID at MS02NV_MAGIC and also | 99 | * The firmware writes MS02NV_ID at MS02NV_MAGIC and also |
100 | * a diagnostic status at MS02NV_DIAG. | 100 | * a diagnostic status at MS02NV_DIAG. |
101 | */ | 101 | */ |
102 | ms02nv_diagp = (ms02nv_uint *)(KSEG1ADDR(addr + MS02NV_DIAG)); | 102 | ms02nv_diagp = (ms02nv_uint *)(CKSEG1ADDR(addr + MS02NV_DIAG)); |
103 | ms02nv_magicp = (ms02nv_uint *)(KSEG1ADDR(addr + MS02NV_MAGIC)); | 103 | ms02nv_magicp = (ms02nv_uint *)(CKSEG1ADDR(addr + MS02NV_MAGIC)); |
104 | err = get_dbe(ms02nv_magic, ms02nv_magicp); | 104 | err = get_dbe(ms02nv_magic, ms02nv_magicp); |
105 | if (err) | 105 | if (err) |
106 | return 0; | 106 | return 0; |
@@ -233,7 +233,7 @@ static int __init ms02nv_init_one(ulong addr) | |||
233 | goto err_out_csr_res; | 233 | goto err_out_csr_res; |
234 | } | 234 | } |
235 | 235 | ||
236 | printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %uMiB.\n", | 236 | printk(KERN_INFO "mtd%d: %s at 0x%08lx, size %zuMiB.\n", |
237 | mtd->index, ms02nv_name, addr, size >> 20); | 237 | mtd->index, ms02nv_name, addr, size >> 20); |
238 | 238 | ||
239 | mp->next = root_ms02nv_mtd; | 239 | mp->next = root_ms02nv_mtd; |