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);