diff options
author | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2007-08-07 22:12:05 +0200 |
commit | 85fad497b3c2e99fa48d18351d2898cf8cdbe898 (patch) | |
tree | 3c53a3ca56eaba5070a5fbcbbe4718d8ea4d082a /cpu/microblaze | |
parent | 706714d97a0d08d59eda4de2268c39f504688329 (diff) | |
parent | b23b547597ff2375ad13a9ab04e5257a3ad76c99 (diff) | |
download | u-boot-midas-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.gz u-boot-midas-85fad497b3c2e99fa48d18351d2898cf8cdbe898.tar.bz2 u-boot-midas-85fad497b3c2e99fa48d18351d2898cf8cdbe898.zip |
Merge git://www.denx.de/git/u-boot
Diffstat (limited to 'cpu/microblaze')
-rw-r--r-- | cpu/microblaze/cache.c | 2 | ||||
-rw-r--r-- | cpu/microblaze/interrupts.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cpu/microblaze/cache.c b/cpu/microblaze/cache.c index 2f86a5440c..4b7866fae5 100644 --- a/cpu/microblaze/cache.c +++ b/cpu/microblaze/cache.c @@ -25,7 +25,7 @@ #include <common.h> #include <asm/asm.h> -#if (CONFIG_COMMANDS & CFG_CMD_CACHE) +#if defined(CONFIG_CMD_CACHE) int dcache_status (void) { diff --git a/cpu/microblaze/interrupts.c b/cpu/microblaze/interrupts.c index b61153f8e6..3f04b29983 100644 --- a/cpu/microblaze/interrupts.c +++ b/cpu/microblaze/interrupts.c @@ -190,7 +190,7 @@ void interrupt_handler (void) } #endif -#if (CONFIG_COMMANDS & CFG_CMD_IRQ) +#if defined(CONFIG_CMD_IRQ) #ifdef CFG_INTC_0 int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) { @@ -217,4 +217,4 @@ int do_irqinfo (cmd_tbl_t * cmdtp, int flag, int argc, char *argv[]) puts ("Undefined interrupt controller\n"); } #endif -#endif /* CONFIG_COMMANDS & CFG_CMD_IRQ */ +#endif |