diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-02 16:00:10 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-12-02 16:00:10 +0100 |
| commit | 77524d2c9d81e97c54e704b65c8a02e4bec0f441 (patch) | |
| tree | 59a4ec271a84c57b4b5127d81ac97ea176ebff85 /drivers/net/at91_emac.c | |
| parent | d44a5f51288aec60c6bdb4ac939d75c24e5bf9c2 (diff) | |
| parent | d07e2b598a690d6eb75019b379fc4933affe3d2c (diff) | |
| download | u-boot-imx-77524d2c9d81e97c54e704b65c8a02e4bec0f441.zip u-boot-imx-77524d2c9d81e97c54e704b65c8a02e4bec0f441.tar.gz u-boot-imx-77524d2c9d81e97c54e704b65c8a02e4bec0f441.tar.bz2 | |
Merge branch 'u-boot-atmel/master' into 'u-boot-arm/master'
Diffstat (limited to 'drivers/net/at91_emac.c')
| -rw-r--r-- | drivers/net/at91_emac.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/net/at91_emac.c b/drivers/net/at91_emac.c index 73612ea..64d4c56 100644 --- a/drivers/net/at91_emac.c +++ b/drivers/net/at91_emac.c @@ -10,19 +10,10 @@ #include <common.h> #include <asm/io.h> -#ifndef CONFIG_AT91_LEGACY #include <asm/arch/hardware.h> #include <asm/arch/at91_emac.h> #include <asm/arch/at91_pmc.h> #include <asm/arch/at91_pio.h> -#else -/* remove next 5 lines, if all RM9200 boards convert to at91 arch */ -#include <asm/arch-at91/at91rm9200.h> -#include <asm/arch-at91/hardware.h> -#include <asm/arch-at91/at91_emac.h> -#include <asm/arch-at91/at91_pmc.h> -#include <asm/arch-at91/at91_pio.h> -#endif #include <net.h> #include <netdev.h> #include <malloc.h> |