From 368bf940a257b942ebbe4f0b0141b179ed032127 Mon Sep 17 00:00:00 2001 From: Cyril Jourdan Date: Tue, 21 Aug 2012 15:46:57 +0200 Subject: {cleo, common}: change eth prefix in NVRAM fields into eth1, refs #2961 --- .../linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cleopatre/linux-2.6.25.10-spc300') diff --git a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c index e9155f65e7..0794278a50 100644 --- a/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c +++ b/cleopatre/linux-2.6.25.10-spc300/arch/arm/mach-spc300/spc300-devices.c @@ -389,7 +389,7 @@ void __init spc300_add_device_uart1(void) void spc300_add_device_ethernet(void) { //Find MAC address from NVRAM - memcpy(&spc300_ethernet_data.mac_addr, spidcom_nvram.eth_address, sizeof(spidcom_nvram.eth_address)); + memcpy(&spc300_ethernet_data.mac_addr, spidcom_nvram.eth1_address, sizeof(spidcom_nvram.eth1_address)); //Find Eth phy connection from NVRAM //TODO:use NVRAM defines @@ -412,7 +412,7 @@ void spc300_add_device_ethernet(void) } //Find PHY address from NVRAM - spc300_ethernet_data.phy_addr = spidcom_nvram.eth_phy_addr; + spc300_ethernet_data.phy_addr = spidcom_nvram.eth1_phy_addr; //Register Ethernet device platform_device_register(&spc300_ethernet_device); -- cgit v1.2.3