diff options
author | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
---|---|---|
committer | Kumar Gala <galak@kernel.crashing.org> | 2006-03-20 10:42:05 -0600 |
commit | f8edca2e9a128f526b1fe6f997f7adb852cf5b3c (patch) | |
tree | 92deb9ddf1153c64ff1ced9392816e60b4ecaa03 /board/xilinx | |
parent | 79582020313e6d992a3bac71cf3a9b337f9ac7f7 (diff) | |
parent | 7b4fd36b0322ec98836a8459d9be80e2777fdc05 (diff) |
Merge branch 'origin'
Conflicts:
CHANGELOG
Diffstat (limited to 'board/xilinx')
-rw-r--r-- | board/xilinx/xilinx_enet/emac_adapter.c | 1 | ||||
-rw-r--r-- | board/xilinx/xilinx_iic/iic_adapter.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/board/xilinx/xilinx_enet/emac_adapter.c b/board/xilinx/xilinx_enet/emac_adapter.c index 5c492ebbc0..b30e897669 100644 --- a/board/xilinx/xilinx_enet/emac_adapter.c +++ b/board/xilinx/xilinx_enet/emac_adapter.c @@ -39,7 +39,6 @@ #include <common.h> #include <net.h> -#include <configs/ml300.h> #include "xparameters.h" #include "xemac.h" diff --git a/board/xilinx/xilinx_iic/iic_adapter.c b/board/xilinx/xilinx_iic/iic_adapter.c index f3ecba72dc..163fe1511d 100644 --- a/board/xilinx/xilinx_iic/iic_adapter.c +++ b/board/xilinx/xilinx_iic/iic_adapter.c @@ -40,7 +40,6 @@ #include <common.h> #include <environment.h> #include <net.h> -#include <configs/ml300.h> #include "xparameters.h" #ifdef CFG_ENV_IS_IN_EEPROM |