diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-05-05 10:09:06 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-05-05 10:09:06 +0200 |
| commit | b939689c7b87773c44275a578ffc8674a867e39d (patch) | |
| tree | 785d71eb0bbc707385e4456a14b21706223d99a3 /arch/arm/cpu/armv7/socfpga/misc.c | |
| parent | 97840b5d1fe0960134c3553a9d9d1c1cd1be784d (diff) | |
| parent | ace97d26176a3ebc9ec07738450de93eea35975c (diff) | |
Merge branch 'u-boot/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/cpu/armv7/socfpga/misc.c')
| -rw-r--r-- | arch/arm/cpu/armv7/socfpga/misc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/cpu/armv7/socfpga/misc.c b/arch/arm/cpu/armv7/socfpga/misc.c index 7873c38e2b1..0f8b4d095d4 100644 --- a/arch/arm/cpu/armv7/socfpga/misc.c +++ b/arch/arm/cpu/armv7/socfpga/misc.c @@ -49,7 +49,7 @@ void enable_caches(void) /* * DesignWare Ethernet initialization */ -#ifdef CONFIG_DESIGNWARE_ETH +#ifdef CONFIG_ETH_DESIGNWARE int cpu_eth_init(bd_t *bis) { #if CONFIG_EMAC_BASE == SOCFPGA_EMAC0_ADDRESS |