From c761a959b1e6c9084f6df24e85dbef0648c93857 Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Sat, 12 Nov 2005 22:00:27 +0000 Subject: [PATCH] --- yaml --- r: 14127 b: refs/heads/master c: 46677736bec5c44601987e8780e55bc242e0aa46 h: refs/heads/master i: 14125: b35dbebe466a48f28c7a51dd333017efad3ed703 14123: ee015746924aadcd32bedd9119ff290ef4b582ad 14119: 431fb8a3ea909335b947b9e567ee102eb567f751 14111: 9ea6f6f3ad7eba8622361706f35e8b0832792755 v: v3 --- [refs] | 2 +- trunk/drivers/serial/dz.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9f50f14f961d..c3c3c68032ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fd8c597214f868df7c0055c54e27baaae8df9e70 +refs/heads/master: 46677736bec5c44601987e8780e55bc242e0aa46 diff --git a/trunk/drivers/serial/dz.c b/trunk/drivers/serial/dz.c index 84840f445345..4d8516d1bb71 100644 --- a/trunk/drivers/serial/dz.c +++ b/trunk/drivers/serial/dz.c @@ -645,9 +645,9 @@ static void __init dz_init_ports(void) if (mips_machtype == MACH_DS23100 || mips_machtype == MACH_DS5100) - base = (unsigned long) KN01_DZ11_BASE; + base = CKSEG1ADDR(KN01_SLOT_BASE + KN01_DZ11); else - base = (unsigned long) KN02_DZ11_BASE; + base = CKSEG1ADDR(KN02_SLOT_BASE + KN02_DZ11); for (i = 0, dport = dz_ports; i < DZ_NB_PORT; i++, dport++) { spin_lock_init(&dport->port.lock);