summaryrefslogtreecommitdiff
path: root/cpu/mpc83xx/interrupts.c
diff options
context:
space:
mode:
authorHaavard Skinnemoen <hskinnemoen@atmel.com>2007-08-13 16:34:33 +0200
committerHaavard Skinnemoen <hskinnemoen@atmel.com>2007-08-13 16:34:33 +0200
commit375c2c9e57ea5b8d678475379378f4774aa9cb88 (patch)
treec8499eaec089c8fe7c9eda562131f45b4a7738c6 /cpu/mpc83xx/interrupts.c
parentf0d1246ed7cb5a88522244c596d7ae7e6f161283 (diff)
parent9986bc3e40e899bea372a99a2bca4071bdf2e24b (diff)
downloadu-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.zip
u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.gz
u-boot-imx-375c2c9e57ea5b8d678475379378f4774aa9cb88.tar.bz2
Merge commit 'upstream/master'
Diffstat (limited to 'cpu/mpc83xx/interrupts.c')
-rw-r--r--cpu/mpc83xx/interrupts.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/mpc83xx/interrupts.c b/cpu/mpc83xx/interrupts.c
index bb1fe1a..98ed21c 100644
--- a/cpu/mpc83xx/interrupts.c
+++ b/cpu/mpc83xx/interrupts.c
@@ -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