Merge git://git.denx.de/u-boot into u-boot

[oweals/u-boot.git] / cpu / ppc4xx / usb_ohci.c

diff --git a/cpu/ppc4xx/usb_ohci.c b/cpu/ppc4xx/usb_ohci.c
index bfa79abceca6d58f1a374288cf49a17d6f482708..2607ed650c6487fc4d5bb131110cba93957d8410 100644 (file)
--- a/cpu/ppc4xx/usb_ohci.c
+++ b/cpu/ppc4xx/usb_ohci.c
@@ -1600,9 +1600,9 @@ int usb_lowlevel_init(void)
        gohci.sleeping = 0;
        gohci.irq = -1;
 #if defined(CONFIG_440EP)
-       gohci.regs = (struct ohci_regs *)(CFG_PERIPHERAL_BASE | 0x1000);
-#elif defined(CONFIG_440EPX) || defined(CFG_USB_HOST)
-       gohci.regs = (struct ohci_regs *)(CFG_USB_HOST);
+       gohci.regs = (struct ohci_regs *)(CONFIG_SYS_PERIPHERAL_BASE | 0x1000);
+#elif defined(CONFIG_440EPX) || defined(CONFIG_SYS_USB_HOST)
+       gohci.regs = (struct ohci_regs *)(CONFIG_SYS_USB_HOST);
 #endif
 
        gohci.flags = 0;