projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-marvell
[oweals/u-boot.git]
/
include
/
configs
/
eNET.h
diff --git
a/include/configs/eNET.h
b/include/configs/eNET.h
index 361fe61b04fdbef4e75cefe20ae6877b2cc8f04d..fc7c1c6ce9dbdafec2b8413ed82ed97226459a26 100644
(file)
--- a/
include/configs/eNET.h
+++ b/
include/configs/eNET.h
@@
-29,8
+29,6
@@
#ifndef __CONFIG_H
#define __CONFIG_H
#ifndef __CONFIG_H
#define __CONFIG_H
-#define CONFIG_RELOC_FIXUP_WORKS
-
/*
* Stuff still to be dealt with -
*/
/*
* Stuff still to be dealt with -
*/
@@
-59,7
+57,6
@@
* Serial Configuration
*/
#define CONFIG_SERIAL_MULTI
* 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
#define CONFIG_CONS_INDEX 1
#define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL