diff options
| author | Ben Warren <bwarren@qstreams.com> | 2007-08-13 21:26:03 -0400 |
|---|---|---|
| committer | Ben Warren <bwarren@qstreams.com> | 2007-08-13 21:26:03 -0400 |
| commit | d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995 (patch) | |
| tree | dd0722cee4758fe40f6a5cc75986ebb1a395aac2 /cpu/ppc4xx/serial.c | |
| parent | f539edc076cfe52bff919dd512ba8d7af0e22092 (diff) | |
| parent | 8a92b7c60b40ff79e2cc96e13aeac2a531dde473 (diff) | |
| download | talos-obmc-uboot-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.tar.gz talos-obmc-uboot-d1bc6c8d5f4a9c7ca9fb2292d5c65f846dcc3995.zip | |
Sync'd u-boot-net with mainline
Merge git://www.denx.de/git/u-boot
Conflicts:
drivers/bcm570x.c
drivers/tigon3.c
Diffstat (limited to 'cpu/ppc4xx/serial.c')
| -rw-r--r-- | cpu/ppc4xx/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpu/ppc4xx/serial.c b/cpu/ppc4xx/serial.c index e62dd9dac5..3f67136be5 100644 --- a/cpu/ppc4xx/serial.c +++ b/cpu/ppc4xx/serial.c @@ -843,7 +843,7 @@ int serial_buffered_tstc (void) #endif /* CONFIG_SERIAL_SOFTWARE_FIFO */ -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) /* AS HARNOIS : according to CONFIG_KGDB_SER_INDEX kgdb uses serial port number 0 or number 1 @@ -949,7 +949,7 @@ void kgdb_interruptible (int yes) return; } #endif /* (CONFIG_KGDB_SER_INDEX & 2) */ -#endif /* CFG_CMD_KGDB */ +#endif #if defined(CONFIG_SERIAL_MULTI) |
