diff options
| author | Wolfgang Denk <[email protected]> | 2010-09-28 23:30:47 +0200 |
|---|---|---|
| committer | Wolfgang Denk <[email protected]> | 2010-09-28 23:30:47 +0200 |
| commit | 2e6e1772c0e34871769be4aef79748fe3e47d953 (patch) | |
| tree | 00e4e19d7bccd2a1cd5753854ff4c2b8a26bebb0 /include/configs/eNET.h | |
| parent | 1e4e5ef0469050f014aee1204dae8a9ab6053e49 (diff) | |
| parent | 3df61957938586c512c17e72d83551d190400981 (diff) | |
Merge branch 'next' of /home/wd/git/u-boot/next
Conflicts:
include/ppc4xx.h
Signed-off-by: Wolfgang Denk <[email protected]>
Diffstat (limited to 'include/configs/eNET.h')
| -rw-r--r-- | include/configs/eNET.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/eNET.h b/include/configs/eNET.h index 361fe61b04f..da2a97d26d4 100644 --- a/include/configs/eNET.h +++ b/include/configs/eNET.h @@ -59,7 +59,6 @@ * Serial Configuration */ #define CONFIG_SERIAL_MULTI -#undef CONFIG_SERIAL_SOFTWARE_FIFO #define CONFIG_CONS_INDEX 1 #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL |