From: edgar_igl <edgar_igl@c046a42c-6fe2-441c-8c8c-71466251a162>
Date: Sat, 24 May 2008 16:03:59 +0000 (+0000)
Subject: ETRAX: Correct check for second nic.
X-Git-Tag: stefano.display-merge-start~1231
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=3ce7a69f151420f5ec7edd40c745f21206da3ce3;p=qemu-xen-3.4-testing.git

ETRAX: Correct check for second nic.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4558 c046a42c-6fe2-441c-8c8c-71466251a162
---

diff --git a/hw/etraxfs.c b/hw/etraxfs.c
index 7b3e2ab6..9886ae96 100644
--- a/hw/etraxfs.c
+++ b/hw/etraxfs.c
@@ -108,7 +108,7 @@ void bareetraxfs_init (ram_addr_t ram_size, int vga_ram_size,
 
     /* Add the two ethernet blocks.  */
     eth[0] = etraxfs_eth_init(&nd_table[0], env, pic + 25, 0xb0034000);
-    if (&nd_table[1])
+    if (nb_nics > 1)
 	    eth[1] = etraxfs_eth_init(&nd_table[1], env, pic + 26, 0xb0036000);
     
     /* The DMA Connector block is missing, hardwire things for now.  */