Merge branch 'master' of git://git.denx.de/u-boot-arm
authorMinkyu Kang <mk7.kang@samsung.com>
Sat, 6 Feb 2010 08:20:09 +0000 (17:20 +0900)
committerMinkyu Kang <mk7.kang@samsung.com>
Sat, 6 Feb 2010 08:20:09 +0000 (17:20 +0900)
Conflicts:

cpu/arm_cortexa8/s5pc1xx/cache.c
include/configs/spear6xx.h
lib_ppc/reloc.S

Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
drivers/net/smc911x.c

index 5d51406..d674ce2 100644 (file)
@@ -270,6 +270,12 @@ int smc911x_initialize(u8 dev_num, int base_addr)
        dev->recv = smc911x_rx;
        sprintf(dev->name, "%s-%hu", DRIVERNAME, dev_num);
 
+       /* Try to detect chip. Will fail if not present. */
+       if (smc911x_detect_chip(dev)) {
+               free(dev);
+               return 0;
+       }
+
        eth_register(dev);
        return 1;
 }