diff options
| author | Andy Fleming <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
|---|---|---|
| committer | Andrew Fleming-AFLEMING <afleming@freescale.com> | 2007-08-03 02:23:23 -0500 |
| commit | 6bf6f114dcdd97ec3f80c2761ed40e31229d6b78 (patch) | |
| tree | 4bc9e1362c3090bb6d2df71109228ca61b8d00ce /board/amirix/ap1000/serial.c | |
| parent | 5a56af3b522ba47fb33a3fee84d23bf1e5429654 (diff) | |
| parent | 5dc210dec5bace98a50b6ba905347890091a9bb0 (diff) | |
| download | olio-uboot-2014.01-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.tar.xz olio-uboot-2014.01-6bf6f114dcdd97ec3f80c2761ed40e31229d6b78.zip | |
Merge branch 'testing' into working
Conflicts:
CHANGELOG
fs/fat/fat.c
include/configs/MPC8560ADS.h
include/configs/pcs440ep.h
net/eth.c
Diffstat (limited to 'board/amirix/ap1000/serial.c')
| -rw-r--r-- | board/amirix/ap1000/serial.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/amirix/ap1000/serial.c b/board/amirix/ap1000/serial.c index c6ee77281..5e9e3a31e 100644 --- a/board/amirix/ap1000/serial.c +++ b/board/amirix/ap1000/serial.c @@ -84,7 +84,7 @@ void serial_puts (const char *s) } } -#if (CONFIG_COMMANDS & CFG_CMD_KGDB) +#if defined(CONFIG_CMD_KGDB) void kgdb_serial_init (void) { } @@ -108,4 +108,4 @@ void kgdb_interruptible (int yes) { return; } -#endif /* CFG_CMD_KGDB */ +#endif |