From d69e128c9db6cd9df8fd534a944f7ce46b88d236 Mon Sep 17 00:00:00 2001 From: chris Date: Sat, 3 Jan 2004 14:42:12 +0000 Subject: [PATCH] On a riscstation leave the iobase as requested, don't add IO_CONF_BASE to it. --- sys/arch/arm/mainbus/mainbus.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arch/arm/mainbus/mainbus.c b/sys/arch/arm/mainbus/mainbus.c index 0675251414bd..6a8d2b98799e 100644 --- a/sys/arch/arm/mainbus/mainbus.c +++ b/sys/arch/arm/mainbus/mainbus.c @@ -1,4 +1,4 @@ -/* $NetBSD: mainbus.c,v 1.9 2003/07/15 00:24:47 lukem Exp $ */ +/* $NetBSD: mainbus.c,v 1.10 2004/01/03 14:42:12 chris Exp $ */ /* * Copyright (c) 1994,1995 Mark Brinicombe. @@ -42,7 +42,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.9 2003/07/15 00:24:47 lukem Exp $"); +__KERNEL_RCSID(0, "$NetBSD: mainbus.c,v 1.10 2004/01/03 14:42:12 chris Exp $"); #include #include @@ -142,7 +142,7 @@ mainbussearch(parent, cf, aux) mb.mb_irq = MAINBUSCF_IRQ_DEFAULT; } else { mb.mb_iobase = cf->cf_loc[MAINBUSCF_BASE]; -#if defined(arm32) /* XXX */ +#if defined(arm32) && !defined(EB7500ATX) mb.mb_iobase += IO_CONF_BASE; #endif mb.mb_iosize = 0;