summaryrefslogtreecommitdiff
path: root/include/asm-arm
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-11-09 00:09:51 +0100
committerWolfgang Denk <wd@denx.de>2008-11-09 00:09:51 +0100
commit23b7b87a37e8732a0229d52e69f5e7e617834f80 (patch)
tree0887ae5d2b385b8cf65a91c8c3d47ef43c1a17e2 /include/asm-arm
parentc06d9bbbeb0416f189e841ffb214ada6194ed874 (diff)
parentd8003fa03733901b73d6c4667b4d80fc8eb1ddd3 (diff)
downloadu-boot-imx-23b7b87a37e8732a0229d52e69f5e7e617834f80.zip
u-boot-imx-23b7b87a37e8732a0229d52e69f5e7e617834f80.tar.gz
u-boot-imx-23b7b87a37e8732a0229d52e69f5e7e617834f80.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'include/asm-arm')
-rw-r--r--include/asm-arm/arch-at91/hardware.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h
index f312419..b881e4e 100644
--- a/include/asm-arm/arch-at91/hardware.h
+++ b/include/asm-arm/arch-at91/hardware.h
@@ -20,7 +20,6 @@
#include <asm/arch/at91rm9200.h>
#elif defined(CONFIG_AT91SAM9260)
#include <asm/arch/at91sam9260.h>
-#define AT91_BASE_EMAC AT91SAM9260_BASE_EMAC
#define AT91_BASE_SPI AT91SAM9260_BASE_SPI0
#define AT91_ID_UHP AT91SAM9260_ID_UHP
#define AT91_PMC_UHP AT91SAM926x_PMC_UHP
@@ -31,7 +30,6 @@
#define AT91_PMC_UHP AT91SAM926x_PMC_UHP
#elif defined(CONFIG_AT91SAM9263)
#include <asm/arch/at91sam9263.h>
-#define AT91_BASE_EMAC AT91SAM9263_BASE_EMAC
#define AT91_BASE_SPI AT91SAM9263_BASE_SPI0
#define AT91_ID_UHP AT91SAM9263_ID_UHP
#define AT91_PMC_UHP AT91SAM926x_PMC_UHP
@@ -41,7 +39,6 @@
#define AT91_ID_UHP AT91SAM9RL_ID_UHP
#elif defined(CONFIG_AT91CAP9)
#include <asm/arch/at91cap9.h>
-#define AT91_BASE_EMAC AT91CAP9_BASE_EMAC
#define AT91_BASE_SPI AT91CAP9_BASE_SPI0
#define AT91_ID_UHP AT91CAP9_ID_UHP
#define AT91_PMC_UHP AT91CAP9_PMC_UHP