diff options
| author | Maciej W. Rozycki <macro@infradead.org> | 2005-11-14 13:41:51 +0000 |
|---|---|---|
| committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-11-29 19:25:47 +0100 |
| commit | 3eb8ceac486ed9b6eceed098423f1ca6b180ec9d (patch) | |
| tree | e1b2e98897563dbc03b44c349246aa89d847fdf3 | |
| parent | 21eeb7aa116b1f59fc23339521173cbb13e57f1a (diff) | |
| download | kernel-crypto-3eb8ceac486ed9b6eceed098423f1ca6b180ec9d.tar.gz kernel-crypto-3eb8ceac486ed9b6eceed098423f1ca6b180ec9d.tar.xz kernel-crypto-3eb8ceac486ed9b6eceed098423f1ca6b180ec9d.zip | |
[MTD] devices/ms02-nv: phys/virt address fixups
Merge from linux-mips:
Use physical addresses at the interface level, letting drivers remap
them as appropriate.
Signed-off-by: Maciej W. Rozycki <macro@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | drivers/mtd/devices/ms02-nv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/mtd/devices/ms02-nv.c b/drivers/mtd/devices/ms02-nv.c index f5026cee087..0ff2e437824 100644 --- a/drivers/mtd/devices/ms02-nv.c +++ b/drivers/mtd/devices/ms02-nv.c @@ -6,7 +6,7 @@ * as published by the Free Software Foundation; either version * 2 of the License, or (at your option) any later version. * - * $Id: ms02-nv.c,v 1.10 2005/06/20 12:24:41 macro Exp $ + * $Id: ms02-nv.c,v 1.11 2005/11/14 13:41:47 macro Exp $ */ #include <linux/init.h> @@ -293,13 +293,13 @@ static int __init ms02nv_init(void) switch (mips_machtype) { case MACH_DS5000_200: - csr = (volatile u32 *)KN02_CSR_BASE; + csr = (volatile u32 *)CKSEG1ADDR(KN02_SLOT_BASE + KN02_CSR); if (*csr & KN02_CSR_BNK32M) stride = 2; break; case MACH_DS5000_2X0: case MACH_DS5900: - csr = (volatile u32 *)KN03_MCR_BASE; + csr = (volatile u32 *)CKSEG1ADDR(KN03_SLOT_BASE + IOASIC_MCR); if (*csr & KN03_MCR_BNK32M) stride = 2; break; |