Merge branch 'master' of git://git.denx.de/u-boot-net

[u-boot] / drivers / net / e1000.c

diff --git a/drivers/net/e1000.c b/drivers/net/e1000.c
index c8b4e98c669e60f315791b1b049a9d172425c1e9..a52749d78cc1109ff12d973422509e5961e881b7 100644 (file)
--- a/drivers/net/e1000.c
+++ b/drivers/net/e1000.c
@@ -82,6 +82,7 @@ static struct pci_device_id supported[] = {
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82540EM_LOM},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541ER},
        {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82541GI_LF},
+       {}
 };
 
 /* Function forward declarations */
@@ -3059,5 +3060,5 @@ e1000_initialize(bd_t * bis)
 
                card_number++;
        }
-       return 1;
+       return card_number;
 }