rename CFG_ macros to CONFIG_SYS

[people/ms/u-boot.git] / cpu / mpc83xx / interrupts.c

diff --git a/cpu/mpc83xx/interrupts.c b/cpu/mpc83xx/interrupts.c
index bb1fe1af3f3bba3c3ca199f7a884a640b79efb87..faffbaf83829bc858937f7d1af97e0f12ef39e5a 100644 (file)
--- a/cpu/mpc83xx/interrupts.c
+++ b/cpu/mpc83xx/interrupts.c
@@ -38,9 +38,9 @@ struct irq_action {
 
 int interrupt_init_cpu (unsigned *decrementer_count)
 {
-       volatile immap_t *immr = (immap_t *) CFG_IMMR;
+       volatile immap_t *immr = (immap_t *) CONFIG_SYS_IMMR;
 
-       *decrementer_count = (gd->bus_clk / 4) / CFG_HZ;
+       *decrementer_count = (gd->bus_clk / 4) / CONFIG_SYS_HZ;
 
        /* Enable e300 time base */
 
@@ -81,7 +81,7 @@ void timer_interrupt_cpu (struct pt_regs *regs)
 }
 
 
-#if (CONFIG_COMMANDS & CFG_CMD_IRQ)
+#if defined(CONFIG_CMD_IRQ)
 
 /* ripped this out of ppc4xx/interrupts.c */
 
@@ -94,4 +94,4 @@ do_irqinfo(cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 {
 }
 
-#endif         /* CONFIG_COMMANDS & CFG_CMD_IRQ */
+#endif